Hive tests with Byzantine

117 files changed, 25653 insertions, 6720 deletions

diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert2_d0g0v0.json
index ed84a5cb1..07d1a2e91 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "LoopCallsDepthThenRevert2_d0g0v0_EIP150" : {
+    "LoopCallsDepthThenRevert2_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/stRevertTest/LoopCallsDepthThenRevert2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x651ab5",
-                    "hash" : "0xac7e61da7394d199fb82a5643f0ba4643233e06670bd9ee6fcd0e781ef3e3ec7",
-                    "mixHash" : "0x56892abb35f7b6af398e3d00ea8a625427912690e49d6010f1233e0862c445b1",
-                    "nonce" : "0xf26f1ba176482f80",
+                    "hash" : "0xe08d3faf0e6ff7895c09fedb64fc20b06171e17511ccc475dbade528dba5ef40",
+                    "mixHash" : "0x13d1be16d99bc3113e941f42a3d11a324242653d47a01aede8a4da3b586fe8fb",
+                    "nonce" : "0x5aeb5f5840c98084",
                     "number" : "0x01",
                     "parentHash" : "0xba4390a27bdb4ccfcd5f8fdf39863297558ceaa2586b4271b9fd13470afc7dd2",
-                    "receiptTrie" : "0x18c05be44953644639ed851baf25910083fdc761ba3ebe4ac7dbfaf1569a5da5",
-                    "stateRoot" : "0x8ba0357920b6f72f4e085c5b0fb0c8d1dda82a9adca2aaf79b5dfe3f7a8cc88a",
+                    "receiptTrie" : "0x7c524a0588c23c04f5a12d2654088ff9df03e085c756a7d33a175c6e9b2ce2e0",
+                    "stateRoot" : "0xf1b3a3d2f416bea70980b398195c8c312e7bfdc15aec2736a6ed8d4f17ae11ea",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x84e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0ba4390a27bdb4ccfcd5f8fdf39863297558ceaa2586b4271b9fd13470afc7dd2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ba0357920b6f72f4e085c5b0fb0c8d1dda82a9adca2aaf79b5dfe3f7a8cc88aa084e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaaa018c05be44953644639ed851baf25910083fdc761ba3ebe4ac7dbfaf1569a5da5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83651ab58203e880a056892abb35f7b6af398e3d00ea8a625427912690e49d6010f1233e0862c445b188f26f1ba176482f80f867f8658001887ffffffffffffff094a00000000000000000000000000000000000000080801ca031bd4c1d75c2daa04386e8431dc78f8e93a10c07927898061e4f188dcea8e708a008afbb59317063ad40204147fb0e6d640f2a055b58fffc1d85ec248265a7bb54c0",
+                "rlp" : "0xf9026af901fda0ba4390a27bdb4ccfcd5f8fdf39863297558ceaa2586b4271b9fd13470afc7dd2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f1b3a3d2f416bea70980b398195c8c312e7bfdc15aec2736a6ed8d4f17ae11eaa084e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaaa07c524a0588c23c04f5a12d2654088ff9df03e085c756a7d33a175c6e9b2ce2e0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83651ab58203e880a013d1be16d99bc3113e941f42a3d11a324242653d47a01aede8a4da3b586fe8fb885aeb5f5840c98084f867f8658001887ffffffffffffff094a00000000000000000000000000000000000000080801ca031bd4c1d75c2daa04386e8431dc78f8e93a10c07927898061e4f188dcea8e708a008afbb59317063ad40204147fb0e6d640f2a055b58fffc1d85ec248265a7bb54c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b57b84448b88f938f2d0f74b4cda6d83dc4c1d47bab9797c677c32cc31b7608a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xac7e61da7394d199fb82a5643f0ba4643233e06670bd9ee6fcd0e781ef3e3ec7",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe08d3faf0e6ff7895c09fedb64fc20b06171e17511ccc475dbade528dba5ef40",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918245591ab5",
                 "code" : "",
@@ -75,7 +82,7 @@
             "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x03",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             },
@@ -112,10 +119,10 @@
             }
         }
     },
-    "LoopCallsDepthThenRevert2_d0g0v0_EIP158" : {
+    "LoopCallsDepthThenRevert2_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/stRevertTest/LoopCallsDepthThenRevert2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -127,18 +134,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x651ab5",
-                    "hash" : "0x12df23c929dc53cb69b233114265158e749a7e6df0d9400a5d6b7758c4ab90e7",
-                    "mixHash" : "0xa0030efbc1cc044c3c9b7c5aa5b76a6643ce9cfc39107bf1c69a12654f2071c2",
-                    "nonce" : "0xc5a074184a50a972",
+                    "hash" : "0x933597a93dbcfb5507b514e693469363052be62bcd90e411b42451ea56b5436c",
+                    "mixHash" : "0x6151c69f002e7d09f47482f8fe6fb54fdaa8ce633097c5c2b5f5349248aee7b7",
+                    "nonce" : "0xf4a23549ab818940",
                     "number" : "0x01",
                     "parentHash" : "0xba4390a27bdb4ccfcd5f8fdf39863297558ceaa2586b4271b9fd13470afc7dd2",
-                    "receiptTrie" : "0x3bb1f20746684227d057f0f355e8982063f9e9eae9912c2f1a5959ea4bc1077b",
-                    "stateRoot" : "0xe43a01ac4cc2fa442d3b86e43ad9e58a822bd30b843a1bd35bc83ee7170adec2",
+                    "receiptTrie" : "0x7c524a0588c23c04f5a12d2654088ff9df03e085c756a7d33a175c6e9b2ce2e0",
+                    "stateRoot" : "0xf1b3a3d2f416bea70980b398195c8c312e7bfdc15aec2736a6ed8d4f17ae11ea",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x84e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0ba4390a27bdb4ccfcd5f8fdf39863297558ceaa2586b4271b9fd13470afc7dd2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e43a01ac4cc2fa442d3b86e43ad9e58a822bd30b843a1bd35bc83ee7170adec2a084e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaaa03bb1f20746684227d057f0f355e8982063f9e9eae9912c2f1a5959ea4bc1077bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83651ab58203e880a0a0030efbc1cc044c3c9b7c5aa5b76a6643ce9cfc39107bf1c69a12654f2071c288c5a074184a50a972f867f8658001887ffffffffffffff094a00000000000000000000000000000000000000080801ca031bd4c1d75c2daa04386e8431dc78f8e93a10c07927898061e4f188dcea8e708a008afbb59317063ad40204147fb0e6d640f2a055b58fffc1d85ec248265a7bb54c0",
+                "rlp" : "0xf9026af901fda0ba4390a27bdb4ccfcd5f8fdf39863297558ceaa2586b4271b9fd13470afc7dd2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f1b3a3d2f416bea70980b398195c8c312e7bfdc15aec2736a6ed8d4f17ae11eaa084e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaaa07c524a0588c23c04f5a12d2654088ff9df03e085c756a7d33a175c6e9b2ce2e0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83651ab58203e880a06151c69f002e7d09f47482f8fe6fb54fdaa8ce633097c5c2b5f5349248aee7b788f4a23549ab818940f867f8658001887ffffffffffffff094a00000000000000000000000000000000000000080801ca031bd4c1d75c2daa04386e8431dc78f8e93a10c07927898061e4f188dcea8e708a008afbb59317063ad40204147fb0e6d640f2a055b58fffc1d85ec248265a7bb54c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -175,9 +182,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b57b84448b88f938f2d0f74b4cda6d83dc4c1d47bab9797c677c32cc31b7608a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x12df23c929dc53cb69b233114265158e749a7e6df0d9400a5d6b7758c4ab90e7",
-        "network" : "EIP158",
+        "lastblockhash" : "0x933597a93dbcfb5507b514e693469363052be62bcd90e411b42451ea56b5436c",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918245591ab5",
                 "code" : "",
@@ -225,10 +239,10 @@
             }
         }
     },
-    "LoopCallsDepthThenRevert2_d0g0v0_Frontier" : {
+    "LoopCallsDepthThenRevert2_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/stRevertTest/LoopCallsDepthThenRevert2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,19 +253,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x7ffffffffffffff0",
-                    "hash" : "0x470b044dd305c1bee593dc05f69477c18748be18a26e319996e491f387f6757a",
-                    "mixHash" : "0xd392b2eb6504ed0a4632152362362c35db0918d9d6a75ae4d15c9618556196ff",
-                    "nonce" : "0xfd685b1fdd6e04eb",
+                    "gasUsed" : "0x651ab5",
+                    "hash" : "0x637e02b947f1509361e947e648635de55b08e0fb62e86fbaf48dd03d9c1c5344",
+                    "mixHash" : "0x93b27c709b880506e427a34431f7f5de41ffe5260324d460a1a1481da62a2458",
+                    "nonce" : "0x1c04374ccc74f013",
                     "number" : "0x01",
                     "parentHash" : "0xba4390a27bdb4ccfcd5f8fdf39863297558ceaa2586b4271b9fd13470afc7dd2",
-                    "receiptTrie" : "0xefd0d7dd7f7811453db73fc5ceec40cd1bb35170029f2c6a013c3113bd30d4e6",
-                    "stateRoot" : "0x4c8b4881629af9172203cef094293e246fd9a4ec1d98211aacca9c7324ded878",
+                    "receiptTrie" : "0x18c05be44953644639ed851baf25910083fdc761ba3ebe4ac7dbfaf1569a5da5",
+                    "stateRoot" : "0x8ba0357920b6f72f4e085c5b0fb0c8d1dda82a9adca2aaf79b5dfe3f7a8cc88a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x84e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff90202a0ba4390a27bdb4ccfcd5f8fdf39863297558ceaa2586b4271b9fd13470afc7dd2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c8b4881629af9172203cef094293e246fd9a4ec1d98211aacca9c7324ded878a084e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaaa0efd0d7dd7f7811453db73fc5ceec40cd1bb35170029f2c6a013c3113bd30d4e6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a0d392b2eb6504ed0a4632152362362c35db0918d9d6a75ae4d15c9618556196ff88fd685b1fdd6e04ebf867f8658001887ffffffffffffff094a00000000000000000000000000000000000000080801ca031bd4c1d75c2daa04386e8431dc78f8e93a10c07927898061e4f188dcea8e708a008afbb59317063ad40204147fb0e6d640f2a055b58fffc1d85ec248265a7bb54c0",
+                "rlp" : "0xf9026af901fda0ba4390a27bdb4ccfcd5f8fdf39863297558ceaa2586b4271b9fd13470afc7dd2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ba0357920b6f72f4e085c5b0fb0c8d1dda82a9adca2aaf79b5dfe3f7a8cc88aa084e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaaa018c05be44953644639ed851baf25910083fdc761ba3ebe4ac7dbfaf1569a5da5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83651ab58203e880a093b27c709b880506e427a34431f7f5de41ffe5260324d460a1a1481da62a2458881c04374ccc74f013f867f8658001887ffffffffffffff094a00000000000000000000000000000000000000080801ca031bd4c1d75c2daa04386e8431dc78f8e93a10c07927898061e4f188dcea8e708a008afbb59317063ad40204147fb0e6d640f2a055b58fffc1d85ec248265a7bb54c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -288,17 +302,41 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b57b84448b88f938f2d0f74b4cda6d83dc4c1d47bab9797c677c32cc31b7608a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x470b044dd305c1bee593dc05f69477c18748be18a26e319996e491f387f6757a",
-        "network" : "Frontier",
+        "lastblockhash" : "0x637e02b947f1509361e947e648635de55b08e0fb62e86fbaf48dd03d9c1c5344",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0xc563918244f3fff0",
+                "balance" : "0x4563918245591ab5",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+                "balance" : "0x03",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x07",
+                "code" : "0x6103ff60005414603f576001600054016000556000600060006000600073a0000000000000000000000000000000000000005af15061041a600054106053575b66600060006002f0600052600760196003f0505b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x03ff"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x13426172c74d822b878fe7ff9ae54b",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x0a",
                 "code" : "0x6103ff60005414603f576001600054016000556000600060006000600073a0000000000000000000000000000000000000005af15061041a600054106053575b66600060006002f0600052600760196003f0505b",
                 "nonce" : "0x00",
@@ -306,7 +344,104 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x13426172c74d81ab878fe800000010",
+                "balance" : "0x13426172c74d822b878fe800000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "LoopCallsDepthThenRevert2_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/LoopCallsDepthThenRevert2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x651ab5",
+                    "hash" : "0xc37877b3c085dd384f89d5b347aaf0f640390fa411a55ec9055eac756f40fba6",
+                    "mixHash" : "0x7657673f75a34038beafc3673882631984e539d536da026d40c31412e85a7b6f",
+                    "nonce" : "0xf9bd9ca839018ef9",
+                    "number" : "0x01",
+                    "parentHash" : "0xba4390a27bdb4ccfcd5f8fdf39863297558ceaa2586b4271b9fd13470afc7dd2",
+                    "receiptTrie" : "0x3bb1f20746684227d057f0f355e8982063f9e9eae9912c2f1a5959ea4bc1077b",
+                    "stateRoot" : "0xe43a01ac4cc2fa442d3b86e43ad9e58a822bd30b843a1bd35bc83ee7170adec2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x84e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaa",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9026af901fda0ba4390a27bdb4ccfcd5f8fdf39863297558ceaa2586b4271b9fd13470afc7dd2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e43a01ac4cc2fa442d3b86e43ad9e58a822bd30b843a1bd35bc83ee7170adec2a084e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaaa03bb1f20746684227d057f0f355e8982063f9e9eae9912c2f1a5959ea4bc1077bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83651ab58203e880a07657673f75a34038beafc3673882631984e539d536da026d40c31412e85a7b6f88f9bd9ca839018ef9f867f8658001887ffffffffffffff094a00000000000000000000000000000000000000080801ca031bd4c1d75c2daa04386e8431dc78f8e93a10c07927898061e4f188dcea8e708a008afbb59317063ad40204147fb0e6d640f2a055b58fffc1d85ec248265a7bb54c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x7ffffffffffffff0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x31bd4c1d75c2daa04386e8431dc78f8e93a10c07927898061e4f188dcea8e708",
+                        "s" : "0x08afbb59317063ad40204147fb0e6d640f2a055b58fffc1d85ec248265a7bb54",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0xba4390a27bdb4ccfcd5f8fdf39863297558ceaa2586b4271b9fd13470afc7dd2",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8b57b84448b88f938f2d0f74b4cda6d83dc4c1d47bab9797c677c32cc31b7608",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b57b84448b88f938f2d0f74b4cda6d83dc4c1d47bab9797c677c32cc31b7608a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc37877b3c085dd384f89d5b347aaf0f640390fa411a55ec9055eac756f40fba6",
+        "network" : "EIP158",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918245591ab5",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+                "balance" : "0x03",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x07",
+                "code" : "0x6103ff60005414603f576001600054016000556000600060006000600073a0000000000000000000000000000000000000005af15061041a600054106053575b66600060006002f0600052600760196003f0505b",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x03ff"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x13426172c74d822b878fe7ff9ae54b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -330,10 +465,10 @@
             }
         }
     },
-    "LoopCallsDepthThenRevert2_d0g0v0_Homestead" : {
+    "LoopCallsDepthThenRevert2_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/stRevertTest/LoopCallsDepthThenRevert2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -345,9 +480,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7ffffffffffffff0",
-                    "hash" : "0x475b839fa6b95460add826158b985f6d101fb2f9f73e9d4bf6d942e56fc99491",
-                    "mixHash" : "0x7a156f97911e71fd284e57a047aedbf421601ef0137db9ca3683532da811dbc0",
-                    "nonce" : "0xb0fce8a825de6b6a",
+                    "hash" : "0x34fa01802341f919c42d89837eb94e2202f13eff340b9f2ad4b9d0e4b78833ca",
+                    "mixHash" : "0x65210d64118facf08a7ac0c5e4cba29b381377f6e689806f6c0468359305aa46",
+                    "nonce" : "0x630813e5f154ee15",
                     "number" : "0x01",
                     "parentHash" : "0xba4390a27bdb4ccfcd5f8fdf39863297558ceaa2586b4271b9fd13470afc7dd2",
                     "receiptTrie" : "0xefd0d7dd7f7811453db73fc5ceec40cd1bb35170029f2c6a013c3113bd30d4e6",
@@ -356,7 +491,7 @@
                     "transactionsTrie" : "0x84e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff90202a0ba4390a27bdb4ccfcd5f8fdf39863297558ceaa2586b4271b9fd13470afc7dd2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c8b4881629af9172203cef094293e246fd9a4ec1d98211aacca9c7324ded878a084e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaaa0efd0d7dd7f7811453db73fc5ceec40cd1bb35170029f2c6a013c3113bd30d4e6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a07a156f97911e71fd284e57a047aedbf421601ef0137db9ca3683532da811dbc088b0fce8a825de6b6af867f8658001887ffffffffffffff094a00000000000000000000000000000000000000080801ca031bd4c1d75c2daa04386e8431dc78f8e93a10c07927898061e4f188dcea8e708a008afbb59317063ad40204147fb0e6d640f2a055b58fffc1d85ec248265a7bb54c0",
+                "rlp" : "0xf9026ff90202a0ba4390a27bdb4ccfcd5f8fdf39863297558ceaa2586b4271b9fd13470afc7dd2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c8b4881629af9172203cef094293e246fd9a4ec1d98211aacca9c7324ded878a084e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaaa0efd0d7dd7f7811453db73fc5ceec40cd1bb35170029f2c6a013c3113bd30d4e6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a065210d64118facf08a7ac0c5e4cba29b381377f6e689806f6c0468359305aa4688630813e5f154ee15f867f8658001887ffffffffffffff094a00000000000000000000000000000000000000080801ca031bd4c1d75c2daa04386e8431dc78f8e93a10c07927898061e4f188dcea8e708a008afbb59317063ad40204147fb0e6d640f2a055b58fffc1d85ec248265a7bb54c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -393,8 +528,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b57b84448b88f938f2d0f74b4cda6d83dc4c1d47bab9797c677c32cc31b7608a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x475b839fa6b95460add826158b985f6d101fb2f9f73e9d4bf6d942e56fc99491",
-        "network" : "Homestead",
+        "lastblockhash" : "0x34fa01802341f919c42d89837eb94e2202f13eff340b9f2ad4b9d0e4b78833ca",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0xc563918244f3fff0",
@@ -435,10 +570,10 @@
             }
         }
     },
-    "LoopCallsDepthThenRevert2_d0g0v0_Metropolis" : {
+    "LoopCallsDepthThenRevert2_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/LoopCallsDepthThenRevert2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -449,19 +584,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x651ab5",
-                    "hash" : "0x84c2e3677a31da93d5762f85e5a0de12782e9dd35efd7ca0fe61e9752aca219a",
-                    "mixHash" : "0xcb50a4547af1739f7908693b8d7f27632b7eef7f66bd9ed6ef36ef7114ff39af",
-                    "nonce" : "0x518fa1bbd9af41ca",
+                    "gasUsed" : "0x7ffffffffffffff0",
+                    "hash" : "0x250945ef0b09c32e67d352f3e5f69097547f6fc9baa457d62cc553892ce8cda0",
+                    "mixHash" : "0xad5e48f515339f660a4a57a69022627a8f2ea5a4d763a6b0be51789689fb7223",
+                    "nonce" : "0x731f8e84e3c1dc96",
                     "number" : "0x01",
                     "parentHash" : "0xba4390a27bdb4ccfcd5f8fdf39863297558ceaa2586b4271b9fd13470afc7dd2",
-                    "receiptTrie" : "0x7c524a0588c23c04f5a12d2654088ff9df03e085c756a7d33a175c6e9b2ce2e0",
-                    "stateRoot" : "0xf1b3a3d2f416bea70980b398195c8c312e7bfdc15aec2736a6ed8d4f17ae11ea",
+                    "receiptTrie" : "0xefd0d7dd7f7811453db73fc5ceec40cd1bb35170029f2c6a013c3113bd30d4e6",
+                    "stateRoot" : "0x4c8b4881629af9172203cef094293e246fd9a4ec1d98211aacca9c7324ded878",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x84e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0ba4390a27bdb4ccfcd5f8fdf39863297558ceaa2586b4271b9fd13470afc7dd2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f1b3a3d2f416bea70980b398195c8c312e7bfdc15aec2736a6ed8d4f17ae11eaa084e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaaa07c524a0588c23c04f5a12d2654088ff9df03e085c756a7d33a175c6e9b2ce2e0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83651ab58203e880a0cb50a4547af1739f7908693b8d7f27632b7eef7f66bd9ed6ef36ef7114ff39af88518fa1bbd9af41caf867f8658001887ffffffffffffff094a00000000000000000000000000000000000000080801ca031bd4c1d75c2daa04386e8431dc78f8e93a10c07927898061e4f188dcea8e708a008afbb59317063ad40204147fb0e6d640f2a055b58fffc1d85ec248265a7bb54c0",
+                "rlp" : "0xf9026ff90202a0ba4390a27bdb4ccfcd5f8fdf39863297558ceaa2586b4271b9fd13470afc7dd2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c8b4881629af9172203cef094293e246fd9a4ec1d98211aacca9c7324ded878a084e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaaa0efd0d7dd7f7811453db73fc5ceec40cd1bb35170029f2c6a013c3113bd30d4e6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a0ad5e48f515339f660a4a57a69022627a8f2ea5a4d763a6b0be51789689fb722388731f8e84e3c1dc96f867f8658001887ffffffffffffff094a00000000000000000000000000000000000000080801ca031bd4c1d75c2daa04386e8431dc78f8e93a10c07927898061e4f188dcea8e708a008afbb59317063ad40204147fb0e6d640f2a055b58fffc1d85ec248265a7bb54c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -498,40 +633,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08b57b84448b88f938f2d0f74b4cda6d83dc4c1d47bab9797c677c32cc31b7608a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x84c2e3677a31da93d5762f85e5a0de12782e9dd35efd7ca0fe61e9752aca219a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x250945ef0b09c32e67d352f3e5f69097547f6fc9baa457d62cc553892ce8cda0",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918245591ab5",
+                "balance" : "0xc563918244f3fff0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
-                "balance" : "0x03",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
             "0xa000000000000000000000000000000000000000" : {
-                "balance" : "0x07",
+                "balance" : "0x0a",
                 "code" : "0x6103ff60005414603f576001600054016000556000600060006000600073a0000000000000000000000000000000000000005af15061041a600054106053575b66600060006002f0600052600760196003f0505b",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x03ff"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x13426172c74d822b878fe7ff9ae54b",
+                "balance" : "0x13426172c74d81ab878fe800000010",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert3_d0g0v0.json
index 2e05c2192..a4a1adc5c 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert3_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "LoopCallsDepthThenRevert3_d0g0v0_EIP150" : {
+    "LoopCallsDepthThenRevert3_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/stRevertTest/LoopCallsDepthThenRevert3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6501ca",
-                    "hash" : "0x6824dbad339092a75bfe4afe36e8e21fe4a6aa2b87d3bdd355776b530edabfcb",
-                    "mixHash" : "0x325e0ef38310f1f720df38125eccdaebe4fb055d1667f87f9ca7971a38006d44",
-                    "nonce" : "0xd0f0e423fb1142c9",
+                    "hash" : "0x664fbcf2e61dddf26ee66929202167df6429ad4cb866fe7a670c1e270c4d4a85",
+                    "mixHash" : "0x4fafa1930cc3c608eecc3dc737dc5849b36fe98410a9e22fffefb5d64e644691",
+                    "nonce" : "0x9624e5c457efcbc4",
                     "number" : "0x01",
                     "parentHash" : "0x9b82ee789627d7c321dcdee5b2ae1c4e939268ede370b65bf8b2f64b85741843",
-                    "receiptTrie" : "0x6fec0af1e815fa520bffc98508cae185ef873eea55e7aee683013f8bdcb83ca7",
-                    "stateRoot" : "0x8744b82458006c99a647f2d1c6ba897ac2520901b24036fe6c9bb27cce55cbf9",
+                    "receiptTrie" : "0xb6580333b6255db99cb068f01ef7913770a7b6a0a02e84fa854cbaf2fca58810",
+                    "stateRoot" : "0x45c0617c318130e14ea2c60339b766fd659cb90a85a536ed4b9e7b0515ab3836",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x84e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda09b82ee789627d7c321dcdee5b2ae1c4e939268ede370b65bf8b2f64b85741843a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08744b82458006c99a647f2d1c6ba897ac2520901b24036fe6c9bb27cce55cbf9a084e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaaa06fec0af1e815fa520bffc98508cae185ef873eea55e7aee683013f8bdcb83ca7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff836501ca8203e880a0325e0ef38310f1f720df38125eccdaebe4fb055d1667f87f9ca7971a38006d4488d0f0e423fb1142c9f867f8658001887ffffffffffffff094a00000000000000000000000000000000000000080801ca031bd4c1d75c2daa04386e8431dc78f8e93a10c07927898061e4f188dcea8e708a008afbb59317063ad40204147fb0e6d640f2a055b58fffc1d85ec248265a7bb54c0",
+                "rlp" : "0xf9026af901fda09b82ee789627d7c321dcdee5b2ae1c4e939268ede370b65bf8b2f64b85741843a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045c0617c318130e14ea2c60339b766fd659cb90a85a536ed4b9e7b0515ab3836a084e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaaa0b6580333b6255db99cb068f01ef7913770a7b6a0a02e84fa854cbaf2fca58810b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff836501ca8203e880a04fafa1930cc3c608eecc3dc737dc5849b36fe98410a9e22fffefb5d64e644691889624e5c457efcbc4f867f8658001887ffffffffffffff094a00000000000000000000000000000000000000080801ca031bd4c1d75c2daa04386e8431dc78f8e93a10c07927898061e4f188dcea8e708a008afbb59317063ad40204147fb0e6d640f2a055b58fffc1d85ec248265a7bb54c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0490f610945243ceb19ca3ffff579bb1f53a163a88f1f329ad744e0b5a3eac54aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6824dbad339092a75bfe4afe36e8e21fe4a6aa2b87d3bdd355776b530edabfcb",
-        "network" : "EIP150",
+        "lastblockhash" : "0x664fbcf2e61dddf26ee66929202167df6429ad4cb866fe7a670c1e270c4d4a85",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x45639182455901ca",
                 "code" : "",
@@ -75,7 +82,7 @@
             "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x01",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x02",
                 "storage" : {
                 }
             },
@@ -94,10 +101,10 @@
                 "storage" : {
                 }
             },
-            "0xee66c46a9df8ee90ba0f904f85ed2eb4fdbd66df" : {
+            "0xcd6807039caffddbd1c28a749ec91bef15f448e5" : {
                 "balance" : "0x02",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             }
@@ -119,10 +126,10 @@
             }
         }
     },
-    "LoopCallsDepthThenRevert3_d0g0v0_EIP158" : {
+    "LoopCallsDepthThenRevert3_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/stRevertTest/LoopCallsDepthThenRevert3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -134,18 +141,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x6501ca",
-                    "hash" : "0xdc81801434cc6752907581c924a236b0ef0815c626b8fbe4ad84a147cfb17233",
-                    "mixHash" : "0xcd6bd87d947e937027470376126e5c4c913e57c4f29b3515c7d68305a362710c",
-                    "nonce" : "0xe9d5085d542b8922",
+                    "hash" : "0x986485c2f89a5d8e79a3b31d921339473ff4fb1158734082c29ef02e5edd7c61",
+                    "mixHash" : "0x502d5c85d0845f7d0163752745a59fce00438944106cc5a302a7ec93bc5a5f92",
+                    "nonce" : "0x378008bdfef337a3",
                     "number" : "0x01",
                     "parentHash" : "0x9b82ee789627d7c321dcdee5b2ae1c4e939268ede370b65bf8b2f64b85741843",
-                    "receiptTrie" : "0x2123a61a97b578e06365f4b1317f3c9e8edc1e7be6c7d5e3ce9cc4ddb2646892",
-                    "stateRoot" : "0xf59604f358d760ee40d763a2b218845aca03c7551eef22b8fc669e848ebdc7f6",
+                    "receiptTrie" : "0xb6580333b6255db99cb068f01ef7913770a7b6a0a02e84fa854cbaf2fca58810",
+                    "stateRoot" : "0x45c0617c318130e14ea2c60339b766fd659cb90a85a536ed4b9e7b0515ab3836",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x84e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda09b82ee789627d7c321dcdee5b2ae1c4e939268ede370b65bf8b2f64b85741843a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f59604f358d760ee40d763a2b218845aca03c7551eef22b8fc669e848ebdc7f6a084e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaaa02123a61a97b578e06365f4b1317f3c9e8edc1e7be6c7d5e3ce9cc4ddb2646892b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff836501ca8203e880a0cd6bd87d947e937027470376126e5c4c913e57c4f29b3515c7d68305a362710c88e9d5085d542b8922f867f8658001887ffffffffffffff094a00000000000000000000000000000000000000080801ca031bd4c1d75c2daa04386e8431dc78f8e93a10c07927898061e4f188dcea8e708a008afbb59317063ad40204147fb0e6d640f2a055b58fffc1d85ec248265a7bb54c0",
+                "rlp" : "0xf9026af901fda09b82ee789627d7c321dcdee5b2ae1c4e939268ede370b65bf8b2f64b85741843a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045c0617c318130e14ea2c60339b766fd659cb90a85a536ed4b9e7b0515ab3836a084e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaaa0b6580333b6255db99cb068f01ef7913770a7b6a0a02e84fa854cbaf2fca58810b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff836501ca8203e880a0502d5c85d0845f7d0163752745a59fce00438944106cc5a302a7ec93bc5a5f9288378008bdfef337a3f867f8658001887ffffffffffffff094a00000000000000000000000000000000000000080801ca031bd4c1d75c2daa04386e8431dc78f8e93a10c07927898061e4f188dcea8e708a008afbb59317063ad40204147fb0e6d640f2a055b58fffc1d85ec248265a7bb54c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -182,9 +189,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0490f610945243ceb19ca3ffff579bb1f53a163a88f1f329ad744e0b5a3eac54aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdc81801434cc6752907581c924a236b0ef0815c626b8fbe4ad84a147cfb17233",
-        "network" : "EIP158",
+        "lastblockhash" : "0x986485c2f89a5d8e79a3b31d921339473ff4fb1158734082c29ef02e5edd7c61",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x45639182455901ca",
                 "code" : "",
@@ -239,10 +253,10 @@
             }
         }
     },
-    "LoopCallsDepthThenRevert3_d0g0v0_Frontier" : {
+    "LoopCallsDepthThenRevert3_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/stRevertTest/LoopCallsDepthThenRevert3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -253,19 +267,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x7ffffffffffffff0",
-                    "hash" : "0x8c36d78d6b301dbae65549232f3f8978681121f752ac7b9a0267d5ec7359720a",
-                    "mixHash" : "0x810fecaa16935f78c22bb6d52bdbc25fcae59ba7639811e9df0102d2ffad0007",
-                    "nonce" : "0x88b573da246fdf4c",
+                    "gasUsed" : "0x6501ca",
+                    "hash" : "0x8f59e3819bfdf3489de6c2c3f2c8c3ee88f433aff4e4c080a1161aa613a89f1c",
+                    "mixHash" : "0x261ea321221e4d1c3f5d1311e70eff5818e8b2f3e85125aacbdb99debb225833",
+                    "nonce" : "0x89ef8f8e527b8026",
                     "number" : "0x01",
                     "parentHash" : "0x9b82ee789627d7c321dcdee5b2ae1c4e939268ede370b65bf8b2f64b85741843",
-                    "receiptTrie" : "0xad1b89fb49bf92cc5b8d2ccbae3abba55d22276813e626da77c1120c56765ba5",
-                    "stateRoot" : "0x1490112ba8faa110806a82628ee2fa4ed5fc07094cfafe76506320f7bfc38716",
+                    "receiptTrie" : "0x6fec0af1e815fa520bffc98508cae185ef873eea55e7aee683013f8bdcb83ca7",
+                    "stateRoot" : "0x8744b82458006c99a647f2d1c6ba897ac2520901b24036fe6c9bb27cce55cbf9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x84e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff90202a09b82ee789627d7c321dcdee5b2ae1c4e939268ede370b65bf8b2f64b85741843a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01490112ba8faa110806a82628ee2fa4ed5fc07094cfafe76506320f7bfc38716a084e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaaa0ad1b89fb49bf92cc5b8d2ccbae3abba55d22276813e626da77c1120c56765ba5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a0810fecaa16935f78c22bb6d52bdbc25fcae59ba7639811e9df0102d2ffad00078888b573da246fdf4cf867f8658001887ffffffffffffff094a00000000000000000000000000000000000000080801ca031bd4c1d75c2daa04386e8431dc78f8e93a10c07927898061e4f188dcea8e708a008afbb59317063ad40204147fb0e6d640f2a055b58fffc1d85ec248265a7bb54c0",
+                "rlp" : "0xf9026af901fda09b82ee789627d7c321dcdee5b2ae1c4e939268ede370b65bf8b2f64b85741843a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08744b82458006c99a647f2d1c6ba897ac2520901b24036fe6c9bb27cce55cbf9a084e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaaa06fec0af1e815fa520bffc98508cae185ef873eea55e7aee683013f8bdcb83ca7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff836501ca8203e880a0261ea321221e4d1c3f5d1311e70eff5818e8b2f3e85125aacbdb99debb2258338889ef8f8e527b8026f867f8658001887ffffffffffffff094a00000000000000000000000000000000000000080801ca031bd4c1d75c2daa04386e8431dc78f8e93a10c07927898061e4f188dcea8e708a008afbb59317063ad40204147fb0e6d640f2a055b58fffc1d85ec248265a7bb54c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -302,29 +316,44 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0490f610945243ceb19ca3ffff579bb1f53a163a88f1f329ad744e0b5a3eac54aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8c36d78d6b301dbae65549232f3f8978681121f752ac7b9a0267d5ec7359720a",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8f59e3819bfdf3489de6c2c3f2c8c3ee88f433aff4e4c080a1161aa613a89f1c",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0xc563918244f3fff0",
+                "balance" : "0x45639182455901ca",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
             "0xa000000000000000000000000000000000000000" : {
-                "balance" : "0x0a",
+                "balance" : "0x07",
                 "code" : "0x6103fe60005414603f576001600054016000556000600060006000600073a0000000000000000000000000000000000000005af15061041a600054106053575b66600060006002f0600052600760196003f0505b",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x03fe"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x13426172c74d81ab878fe800000010",
+                "balance" : "0x13426172c74d822b878fe7ff9afe36",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
+            },
+            "0xee66c46a9df8ee90ba0f904f85ed2eb4fdbd66df" : {
+                "balance" : "0x02",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "pre" : {
@@ -344,10 +373,10 @@
             }
         }
     },
-    "LoopCallsDepthThenRevert3_d0g0v0_Homestead" : {
+    "LoopCallsDepthThenRevert3_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/stRevertTest/LoopCallsDepthThenRevert3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -358,19 +387,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x7ffffffffffffff0",
-                    "hash" : "0xe4180904321688e434163905c1de196165f47802d8689eaaa04e7cb23e28b366",
-                    "mixHash" : "0x6288f0165ebec5a259ed6a59795350f71789bf9c1aa8e7643f6cde5199972e17",
-                    "nonce" : "0x9725e718faf5f15d",
+                    "gasUsed" : "0x6501ca",
+                    "hash" : "0xcb09fc5a502e198a247c8f5ad8a53695d8947bdf9258bcf407ebf595bd93b54b",
+                    "mixHash" : "0x52e7c1875277ca81abc8093e8462467c17ec11c7d5116a3d7bc160490f044055",
+                    "nonce" : "0x6d134f0e1d4b5397",
                     "number" : "0x01",
                     "parentHash" : "0x9b82ee789627d7c321dcdee5b2ae1c4e939268ede370b65bf8b2f64b85741843",
-                    "receiptTrie" : "0xad1b89fb49bf92cc5b8d2ccbae3abba55d22276813e626da77c1120c56765ba5",
-                    "stateRoot" : "0x1490112ba8faa110806a82628ee2fa4ed5fc07094cfafe76506320f7bfc38716",
+                    "receiptTrie" : "0x2123a61a97b578e06365f4b1317f3c9e8edc1e7be6c7d5e3ce9cc4ddb2646892",
+                    "stateRoot" : "0xf59604f358d760ee40d763a2b218845aca03c7551eef22b8fc669e848ebdc7f6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x84e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff90202a09b82ee789627d7c321dcdee5b2ae1c4e939268ede370b65bf8b2f64b85741843a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01490112ba8faa110806a82628ee2fa4ed5fc07094cfafe76506320f7bfc38716a084e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaaa0ad1b89fb49bf92cc5b8d2ccbae3abba55d22276813e626da77c1120c56765ba5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a06288f0165ebec5a259ed6a59795350f71789bf9c1aa8e7643f6cde5199972e17889725e718faf5f15df867f8658001887ffffffffffffff094a00000000000000000000000000000000000000080801ca031bd4c1d75c2daa04386e8431dc78f8e93a10c07927898061e4f188dcea8e708a008afbb59317063ad40204147fb0e6d640f2a055b58fffc1d85ec248265a7bb54c0",
+                "rlp" : "0xf9026af901fda09b82ee789627d7c321dcdee5b2ae1c4e939268ede370b65bf8b2f64b85741843a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f59604f358d760ee40d763a2b218845aca03c7551eef22b8fc669e848ebdc7f6a084e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaaa02123a61a97b578e06365f4b1317f3c9e8edc1e7be6c7d5e3ce9cc4ddb2646892b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff836501ca8203e880a052e7c1875277ca81abc8093e8462467c17ec11c7d5116a3d7bc160490f044055886d134f0e1d4b5397f867f8658001887ffffffffffffff094a00000000000000000000000000000000000000080801ca031bd4c1d75c2daa04386e8431dc78f8e93a10c07927898061e4f188dcea8e708a008afbb59317063ad40204147fb0e6d640f2a055b58fffc1d85ec248265a7bb54c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -407,25 +436,40 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0490f610945243ceb19ca3ffff579bb1f53a163a88f1f329ad744e0b5a3eac54aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe4180904321688e434163905c1de196165f47802d8689eaaa04e7cb23e28b366",
-        "network" : "Homestead",
+        "lastblockhash" : "0xcb09fc5a502e198a247c8f5ad8a53695d8947bdf9258bcf407ebf595bd93b54b",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0xc563918244f3fff0",
+                "balance" : "0x45639182455901ca",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
             "0xa000000000000000000000000000000000000000" : {
-                "balance" : "0x0a",
+                "balance" : "0x07",
                 "code" : "0x6103fe60005414603f576001600054016000556000600060006000600073a0000000000000000000000000000000000000005af15061041a600054106053575b66600060006002f0600052600760196003f0505b",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x03fe"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x13426172c74d81ab878fe800000010",
+                "balance" : "0x13426172c74d822b878fe7ff9afe36",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xcd6807039caffddbd1c28a749ec91bef15f448e5" : {
+                "balance" : "0x02",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -449,10 +493,10 @@
             }
         }
     },
-    "LoopCallsDepthThenRevert3_d0g0v0_Metropolis" : {
+    "LoopCallsDepthThenRevert3_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/stRevertTest/LoopCallsDepthThenRevert3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -463,19 +507,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x6501ca",
-                    "hash" : "0xc922516ab9aa3bd7a8c520fe0821fc32d739f19cf31d23a8b773c53d30311d45",
-                    "mixHash" : "0x9c536d90bef11dab5faacba9646ba58a1fae326e89099cba9bf25f84ff005cb9",
-                    "nonce" : "0x3e5992deb8d0d980",
+                    "gasUsed" : "0x7ffffffffffffff0",
+                    "hash" : "0x8996547db10bfb21f8d558ce8a1f631dd3c6a1780dc9893db10430757d274d3f",
+                    "mixHash" : "0xdc7ab6c0e7eb784514c4fb127617b8f727058561bc445ec58643734fa20f2dcf",
+                    "nonce" : "0x563768d92fceeb0e",
                     "number" : "0x01",
                     "parentHash" : "0x9b82ee789627d7c321dcdee5b2ae1c4e939268ede370b65bf8b2f64b85741843",
-                    "receiptTrie" : "0xb6580333b6255db99cb068f01ef7913770a7b6a0a02e84fa854cbaf2fca58810",
-                    "stateRoot" : "0x45c0617c318130e14ea2c60339b766fd659cb90a85a536ed4b9e7b0515ab3836",
+                    "receiptTrie" : "0xad1b89fb49bf92cc5b8d2ccbae3abba55d22276813e626da77c1120c56765ba5",
+                    "stateRoot" : "0x1490112ba8faa110806a82628ee2fa4ed5fc07094cfafe76506320f7bfc38716",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x84e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaa",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda09b82ee789627d7c321dcdee5b2ae1c4e939268ede370b65bf8b2f64b85741843a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045c0617c318130e14ea2c60339b766fd659cb90a85a536ed4b9e7b0515ab3836a084e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaaa0b6580333b6255db99cb068f01ef7913770a7b6a0a02e84fa854cbaf2fca58810b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff836501ca8203e880a09c536d90bef11dab5faacba9646ba58a1fae326e89099cba9bf25f84ff005cb9883e5992deb8d0d980f867f8658001887ffffffffffffff094a00000000000000000000000000000000000000080801ca031bd4c1d75c2daa04386e8431dc78f8e93a10c07927898061e4f188dcea8e708a008afbb59317063ad40204147fb0e6d640f2a055b58fffc1d85ec248265a7bb54c0",
+                "rlp" : "0xf9026ff90202a09b82ee789627d7c321dcdee5b2ae1c4e939268ede370b65bf8b2f64b85741843a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01490112ba8faa110806a82628ee2fa4ed5fc07094cfafe76506320f7bfc38716a084e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaaa0ad1b89fb49bf92cc5b8d2ccbae3abba55d22276813e626da77c1120c56765ba5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a0dc7ab6c0e7eb784514c4fb127617b8f727058561bc445ec58643734fa20f2dcf88563768d92fceeb0ef867f8658001887ffffffffffffff094a00000000000000000000000000000000000000080801ca031bd4c1d75c2daa04386e8431dc78f8e93a10c07927898061e4f188dcea8e708a008afbb59317063ad40204147fb0e6d640f2a055b58fffc1d85ec248265a7bb54c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -512,47 +556,130 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0490f610945243ceb19ca3ffff579bb1f53a163a88f1f329ad744e0b5a3eac54aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc922516ab9aa3bd7a8c520fe0821fc32d739f19cf31d23a8b773c53d30311d45",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x8996547db10bfb21f8d558ce8a1f631dd3c6a1780dc9893db10430757d274d3f",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0xc563918244f3fff0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x45639182455901ca",
-                "code" : "",
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x0a",
+                "code" : "0x6103fe60005414603f576001600054016000556000600060006000600073a0000000000000000000000000000000000000005af15061041a600054106053575b66600060006002f0600052600760196003f0505b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
-                "balance" : "0x01",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x13426172c74d81ab878fe800000010",
                 "code" : "",
-                "nonce" : "0x02",
+                "nonce" : "0x01",
                 "storage" : {
                 }
-            },
+            }
+        },
+        "pre" : {
             "0xa000000000000000000000000000000000000000" : {
-                "balance" : "0x07",
+                "balance" : "0x0a",
                 "code" : "0x6103fe60005414603f576001600054016000556000600060006000600073a0000000000000000000000000000000000000005af15061041a600054106053575b66600060006002f0600052600760196003f0505b",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x03fe"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x13426172c74d822b878fe7ff9afe36",
+                "balance" : "0x13426172c74d822b878fe800000000",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "LoopCallsDepthThenRevert3_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/LoopCallsDepthThenRevert3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x7ffffffffffffff0",
+                    "hash" : "0x29444de43fb8204706130be48b2ecd7957634c6c202fe86c28e44bf9fdf80296",
+                    "mixHash" : "0x1b07e8ef34fff27f6cc6879fcf7ccad89e0dda5191686a74f0802ff690f2efeb",
+                    "nonce" : "0x4e5877a4890df92f",
+                    "number" : "0x01",
+                    "parentHash" : "0x9b82ee789627d7c321dcdee5b2ae1c4e939268ede370b65bf8b2f64b85741843",
+                    "receiptTrie" : "0xad1b89fb49bf92cc5b8d2ccbae3abba55d22276813e626da77c1120c56765ba5",
+                    "stateRoot" : "0x1490112ba8faa110806a82628ee2fa4ed5fc07094cfafe76506320f7bfc38716",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x84e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaa",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9026ff90202a09b82ee789627d7c321dcdee5b2ae1c4e939268ede370b65bf8b2f64b85741843a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01490112ba8faa110806a82628ee2fa4ed5fc07094cfafe76506320f7bfc38716a084e5036f9cf532e8fbf3c0ac0355c029f4837793e32be7bf51262adb82d6fcaaa0ad1b89fb49bf92cc5b8d2ccbae3abba55d22276813e626da77c1120c56765ba5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a01b07e8ef34fff27f6cc6879fcf7ccad89e0dda5191686a74f0802ff690f2efeb884e5877a4890df92ff867f8658001887ffffffffffffff094a00000000000000000000000000000000000000080801ca031bd4c1d75c2daa04386e8431dc78f8e93a10c07927898061e4f188dcea8e708a008afbb59317063ad40204147fb0e6d640f2a055b58fffc1d85ec248265a7bb54c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x7ffffffffffffff0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x31bd4c1d75c2daa04386e8431dc78f8e93a10c07927898061e4f188dcea8e708",
+                        "s" : "0x08afbb59317063ad40204147fb0e6d640f2a055b58fffc1d85ec248265a7bb54",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0x9b82ee789627d7c321dcdee5b2ae1c4e939268ede370b65bf8b2f64b85741843",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x490f610945243ceb19ca3ffff579bb1f53a163a88f1f329ad744e0b5a3eac54a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0490f610945243ceb19ca3ffff579bb1f53a163a88f1f329ad744e0b5a3eac54aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x29444de43fb8204706130be48b2ecd7957634c6c202fe86c28e44bf9fdf80296",
+        "network" : "Homestead",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0xc563918244f3fff0",
+                "code" : "",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0xcd6807039caffddbd1c28a749ec91bef15f448e5" : {
-                "balance" : "0x02",
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x0a",
+                "code" : "0x6103fe60005414603f576001600054016000556000600060006000600073a0000000000000000000000000000000000000005af15061041a600054106053575b66600060006002f0600052600760196003f0505b",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x13426172c74d81ab878fe800000010",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert_d0g0v0.json
index db0f5b7b0..4e068d568 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "LoopCallsDepthThenRevert_d0g0v0_EIP150" : {
+    "LoopCallsDepthThenRevert_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/stRevertTest/LoopCallsDepthThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x13da36",
-                    "hash" : "0x7841921a735864ff4a15850037f375180c6b847b71014a32825957053ef71a78",
-                    "mixHash" : "0xfbd3f83bf3d27fcc2b2d177e0da23c8b8d9c2d0e3b985f05576f45ada1f60153",
-                    "nonce" : "0x100588164d5aa8dd",
+                    "hash" : "0xeaecbb831860a0e7df0609b336295c3d13c7565cc3a60d715bac0f301465799e",
+                    "mixHash" : "0x6f03c42cf3a28204da5ba1305bac4f95174b67b14f3810dbd2002f69374110fa",
+                    "nonce" : "0x369509f152441e44",
                     "number" : "0x01",
                     "parentHash" : "0x6bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cb",
-                    "receiptTrie" : "0x2bab6e17893ecece04c07a16403340c283570a0312fc8f4fa9fc24283bae393a",
-                    "stateRoot" : "0xb3dc40cbc6578476c0343c98288611b5ff1f67e24e038ab3993f35a8df45d944",
+                    "receiptTrie" : "0x80a850ff8b6e63ae8e0a0d87095a604cc2cd8ea0c78962e8f4e31f5ed5352ee7",
+                    "stateRoot" : "0x991ece84ea8e589bced01a297443a1545c971c886f22f27936023066a2241482",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3dc40cbc6578476c0343c98288611b5ff1f67e24e038ab3993f35a8df45d944a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda02bab6e17893ecece04c07a16403340c283570a0312fc8f4fa9fc24283bae393ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313da368203e880a0fbd3f83bf3d27fcc2b2d177e0da23c8b8d9c2d0e3b985f05576f45ada1f6015388100588164d5aa8ddf862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a06bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0991ece84ea8e589bced01a297443a1545c971c886f22f27936023066a2241482a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda080a850ff8b6e63ae8e0a0d87095a604cc2cd8ea0c78962e8f4e31f5ed5352ee7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313da368203e880a06f03c42cf3a28204da5ba1305bac4f95174b67b14f3810dbd2002f69374110fa88369509f152441e44f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d955696f9d325d326d643fb6db88f6ebc36cb3182acae0b57c43c1a23351b89a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7841921a735864ff4a15850037f375180c6b847b71014a32825957053ef71a78",
-        "network" : "EIP150",
+        "lastblockhash" : "0xeaecbb831860a0e7df0609b336295c3d13c7565cc3a60d715bac0f301465799e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x456391824507da36",
                 "code" : "",
@@ -120,10 +127,138 @@
             }
         }
     },
-    "LoopCallsDepthThenRevert_d0g0v0_EIP158" : {
+    "LoopCallsDepthThenRevert_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/LoopCallsDepthThenRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x13da36",
+                    "hash" : "0xceb8e0cd836d3ad2c2b20e6cd0675c6b25b4600e7bc32f6052f01a342a4b2f5e",
+                    "mixHash" : "0x7e565725511486ca759b830af6f24eee0b160dbf8781e90b9b2b9224da33c15e",
+                    "nonce" : "0xef3fd9eacdbc0263",
+                    "number" : "0x01",
+                    "parentHash" : "0x6bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cb",
+                    "receiptTrie" : "0x80a850ff8b6e63ae8e0a0d87095a604cc2cd8ea0c78962e8f4e31f5ed5352ee7",
+                    "stateRoot" : "0x991ece84ea8e589bced01a297443a1545c971c886f22f27936023066a2241482",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a06bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0991ece84ea8e589bced01a297443a1545c971c886f22f27936023066a2241482a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda080a850ff8b6e63ae8e0a0d87095a604cc2cd8ea0c78962e8f4e31f5ed5352ee7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313da368203e880a07e565725511486ca759b830af6f24eee0b160dbf8781e90b9b2b9224da33c15e88ef3fd9eacdbc0263f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x989680",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88",
+                        "s" : "0x13761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x6bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3d955696f9d325d326d643fb6db88f6ebc36cb3182acae0b57c43c1a23351b89",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d955696f9d325d326d643fb6db88f6ebc36cb3182acae0b57c43c1a23351b89a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xceb8e0cd836d3ad2c2b20e6cd0675c6b25b4600e7bc32f6052f01a342a4b2f5e",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x456391824507da36",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600054016000556000600060006000600073b0000000000000000000000000000000000000005af1",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x69"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d49135ca",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600054016000556000600060006000600073a0000000000000000000000000000000000000005af1",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x69"
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600054016000556000600060006000600073b0000000000000000000000000000000000000005af1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6001600054016000556000600060006000600073a0000000000000000000000000000000000000005af1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "LoopCallsDepthThenRevert_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/stRevertTest/LoopCallsDepthThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,9 +270,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x13da36",
-                    "hash" : "0xc5642267d8597a8ee8eb64751c6eb64c65deb0cd4605ebbd8567539f4c93b004",
-                    "mixHash" : "0x02ca97424350fd4badd7cb3a9e3c664a47d99bc47e0214f111ba39e00f6652ba",
-                    "nonce" : "0x401f3a5c6ed4b0e3",
+                    "hash" : "0xfeff37e332c4429d4aaf3dd707fa0f025958bf9c8c11f6f0b1821e6c2c83b4d9",
+                    "mixHash" : "0xe9c9b0388d209e4a3babc930a45e574957ac3b0e1765c4774dbe7c9695885925",
+                    "nonce" : "0x2558840b88b85806",
                     "number" : "0x01",
                     "parentHash" : "0x6bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cb",
                     "receiptTrie" : "0x2bab6e17893ecece04c07a16403340c283570a0312fc8f4fa9fc24283bae393a",
@@ -146,7 +281,7 @@
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3dc40cbc6578476c0343c98288611b5ff1f67e24e038ab3993f35a8df45d944a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda02bab6e17893ecece04c07a16403340c283570a0312fc8f4fa9fc24283bae393ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313da368203e880a002ca97424350fd4badd7cb3a9e3c664a47d99bc47e0214f111ba39e00f6652ba88401f3a5c6ed4b0e3f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a06bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3dc40cbc6578476c0343c98288611b5ff1f67e24e038ab3993f35a8df45d944a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda02bab6e17893ecece04c07a16403340c283570a0312fc8f4fa9fc24283bae393ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313da368203e880a0e9c9b0388d209e4a3babc930a45e574957ac3b0e1765c4774dbe7c9695885925882558840b88b85806f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,8 +318,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d955696f9d325d326d643fb6db88f6ebc36cb3182acae0b57c43c1a23351b89a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc5642267d8597a8ee8eb64751c6eb64c65deb0cd4605ebbd8567539f4c93b004",
-        "network" : "EIP158",
+        "lastblockhash" : "0xfeff37e332c4429d4aaf3dd707fa0f025958bf9c8c11f6f0b1821e6c2c83b4d9",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x456391824507da36",
@@ -241,10 +376,10 @@
             }
         }
     },
-    "LoopCallsDepthThenRevert_d0g0v0_Frontier" : {
+    "LoopCallsDepthThenRevert_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/stRevertTest/LoopCallsDepthThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -255,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x989680",
-                    "hash" : "0xcfb67f4f43956a10a1f895a1aa3c824ddca20bc695377ab91a4063766a220480",
-                    "mixHash" : "0x109f60af327ad42a1840c334b8e88cec44585fb16492f0d44d1a6bbecd0c9164",
-                    "nonce" : "0x0289f161c72a5882",
+                    "gasUsed" : "0x13da36",
+                    "hash" : "0xde06b3e63585e5a1dcd6d5bcadb77676cc887627ac2917e666868943e83a8744",
+                    "mixHash" : "0x3c861b89e2f74ef552b7ed66b5b5f84ad7c949488af67f1bbd3a53a8405f3b8c",
+                    "nonce" : "0x32b49cd81ac043fc",
                     "number" : "0x01",
                     "parentHash" : "0x6bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cb",
-                    "receiptTrie" : "0xafd86c14486acbfdd8f33b82d2eced4a0ecdfed95c7c4c26c1ae4aa449747b5e",
-                    "stateRoot" : "0x6d9bc3b558078a8985692a1e4bcbf6adff296281ef23bc560f28b862573bae8d",
+                    "receiptTrie" : "0x2bab6e17893ecece04c07a16403340c283570a0312fc8f4fa9fc24283bae393a",
+                    "stateRoot" : "0xb3dc40cbc6578476c0343c98288611b5ff1f67e24e038ab3993f35a8df45d944",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d9bc3b558078a8985692a1e4bcbf6adff296281ef23bc560f28b862573bae8da0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda0afd86c14486acbfdd8f33b82d2eced4a0ecdfed95c7c4c26c1ae4aa449747b5eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680839896808203e880a0109f60af327ad42a1840c334b8e88cec44585fb16492f0d44d1a6bbecd0c9164880289f161c72a5882f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a06bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3dc40cbc6578476c0343c98288611b5ff1f67e24e038ab3993f35a8df45d944a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda02bab6e17893ecece04c07a16403340c283570a0312fc8f4fa9fc24283bae393ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313da368203e880a03c861b89e2f74ef552b7ed66b5b5f84ad7c949488af67f1bbd3a53a8405f3b8c8832b49cd81ac043fcf862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,11 +439,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d955696f9d325d326d643fb6db88f6ebc36cb3182acae0b57c43c1a23351b89a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcfb67f4f43956a10a1f895a1aa3c824ddca20bc695377ab91a4063766a220480",
-        "network" : "Frontier",
+        "lastblockhash" : "0xde06b3e63585e5a1dcd6d5bcadb77676cc887627ac2917e666868943e83a8744",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x45639182458c9680",
+                "balance" : "0x456391824507da36",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -319,10 +454,11 @@
                 "code" : "0x6001600054016000556000600060006000600073b0000000000000000000000000000000000000005af1",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x69"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d40c7980",
+                "balance" : "0xe8d49135ca",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -333,6 +469,7 @@
                 "code" : "0x6001600054016000556000600060006000600073a0000000000000000000000000000000000000005af1",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x69"
                 }
             }
         },
@@ -360,10 +497,10 @@
             }
         }
     },
-    "LoopCallsDepthThenRevert_d0g0v0_Homestead" : {
+    "LoopCallsDepthThenRevert_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/stRevertTest/LoopCallsDepthThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -375,9 +512,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x989680",
-                    "hash" : "0xbf09cf94c596ddd8b26b3959f1659841538a0e1d7ced80abec592142e3e81eef",
-                    "mixHash" : "0xfd5b7c8d2a7277d3422d867a911b711e94bfe6b3c8ebd6bb5fb6c8d7cdae3eb6",
-                    "nonce" : "0x3260aea4c64ce959",
+                    "hash" : "0xa4bd5815cc2fff1e8320946269fadd115f693f1b0360df025038ebbf957c3c73",
+                    "mixHash" : "0xc9b46db49546c338b3180d4dfe511210f4e5aee39954402814ff3c05a06fc900",
+                    "nonce" : "0xe7f69b963132085e",
                     "number" : "0x01",
                     "parentHash" : "0x6bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cb",
                     "receiptTrie" : "0xafd86c14486acbfdd8f33b82d2eced4a0ecdfed95c7c4c26c1ae4aa449747b5e",
@@ -386,7 +523,7 @@
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d9bc3b558078a8985692a1e4bcbf6adff296281ef23bc560f28b862573bae8da0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda0afd86c14486acbfdd8f33b82d2eced4a0ecdfed95c7c4c26c1ae4aa449747b5eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680839896808203e880a0fd5b7c8d2a7277d3422d867a911b711e94bfe6b3c8ebd6bb5fb6c8d7cdae3eb6883260aea4c64ce959f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a06bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d9bc3b558078a8985692a1e4bcbf6adff296281ef23bc560f28b862573bae8da0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda0afd86c14486acbfdd8f33b82d2eced4a0ecdfed95c7c4c26c1ae4aa449747b5eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680839896808203e880a0c9b46db49546c338b3180d4dfe511210f4e5aee39954402814ff3c05a06fc90088e7f69b963132085ef862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -423,8 +560,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d955696f9d325d326d643fb6db88f6ebc36cb3182acae0b57c43c1a23351b89a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbf09cf94c596ddd8b26b3959f1659841538a0e1d7ced80abec592142e3e81eef",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa4bd5815cc2fff1e8320946269fadd115f693f1b0360df025038ebbf957c3c73",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x45639182458c9680",
@@ -479,10 +616,10 @@
             }
         }
     },
-    "LoopCallsDepthThenRevert_d0g0v0_Metropolis" : {
+    "LoopCallsDepthThenRevert_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/LoopCallsDepthThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -493,19 +630,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x13da36",
-                    "hash" : "0x493562455cd431526da3929d508f5e32effba77b30de19d99a99577536fadd71",
-                    "mixHash" : "0xe0f62a4cf27807264921a4486a6cc9dbc0764554a69bf2b5ed099d5610c1c8c6",
-                    "nonce" : "0xb112a2df643ec29f",
+                    "gasUsed" : "0x989680",
+                    "hash" : "0xcccef5768a116ac1a62e6f882f16585ab8eaddc7e1618518980a930886049808",
+                    "mixHash" : "0xd0b1ccd55b14499595caa9cf51131e0e113bc1400421b4853748c983e3bf2311",
+                    "nonce" : "0xdaff819009b3dbcc",
                     "number" : "0x01",
                     "parentHash" : "0x6bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cb",
-                    "receiptTrie" : "0x80a850ff8b6e63ae8e0a0d87095a604cc2cd8ea0c78962e8f4e31f5ed5352ee7",
-                    "stateRoot" : "0x991ece84ea8e589bced01a297443a1545c971c886f22f27936023066a2241482",
+                    "receiptTrie" : "0xafd86c14486acbfdd8f33b82d2eced4a0ecdfed95c7c4c26c1ae4aa449747b5e",
+                    "stateRoot" : "0x6d9bc3b558078a8985692a1e4bcbf6adff296281ef23bc560f28b862573bae8d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0991ece84ea8e589bced01a297443a1545c971c886f22f27936023066a2241482a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda080a850ff8b6e63ae8e0a0d87095a604cc2cd8ea0c78962e8f4e31f5ed5352ee7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313da368203e880a0e0f62a4cf27807264921a4486a6cc9dbc0764554a69bf2b5ed099d5610c1c8c688b112a2df643ec29ff862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a06bc5a995a71c435e1befdd28009f74f66848ddd9e4d18d4a244990ce4286f5cba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d9bc3b558078a8985692a1e4bcbf6adff296281ef23bc560f28b862573bae8da0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda0afd86c14486acbfdd8f33b82d2eced4a0ecdfed95c7c4c26c1ae4aa449747b5eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680839896808203e880a0d0b1ccd55b14499595caa9cf51131e0e113bc1400421b4853748c983e3bf231188daff819009b3dbccf862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -542,18 +679,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d955696f9d325d326d643fb6db88f6ebc36cb3182acae0b57c43c1a23351b89a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x493562455cd431526da3929d508f5e32effba77b30de19d99a99577536fadd71",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xcccef5768a116ac1a62e6f882f16585ab8eaddc7e1618518980a930886049808",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824507da36",
+                "balance" : "0x45639182458c9680",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -564,11 +694,10 @@
                 "code" : "0x6001600054016000556000600060006000600073b0000000000000000000000000000000000000005af1",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x69"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d49135ca",
+                "balance" : "0xe8d40c7980",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -579,7 +708,6 @@
                 "code" : "0x6001600054016000556000600060006000600073a0000000000000000000000000000000000000005af1",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x69"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/LoopCallsThenRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/LoopCallsThenRevert_d0g0v0.json
index b7121550d..3edee02ba 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/LoopCallsThenRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/LoopCallsThenRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "LoopCallsThenRevert_d0g0v0_EIP150" : {
+    "LoopCallsThenRevert_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/stRevertTest/LoopCallsThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x93b610",
-                    "hash" : "0x06585c5104373d785b32785017284d2fb488ca1d3c9373151ae9a5fd344482f6",
-                    "mixHash" : "0xb0dc4831c6e9346ecf6bac01088ff99dd13571d34e6eea437f2dd28f341d0814",
-                    "nonce" : "0xb87f2c5e247589f4",
+                    "hash" : "0x05f19e6e8cc1bec51eead804499fb49ab1d9d5ca54204d8683c7c99afccf436b",
+                    "mixHash" : "0x0ed6604e8bcce2783b9c2ca0a5e79cc6d9014bc0487835feca94bf3b9b422111",
+                    "nonce" : "0xd179f84c6b969cb0",
                     "number" : "0x01",
                     "parentHash" : "0x7e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1ac",
-                    "receiptTrie" : "0xf68abed6ce6d9556257dc58e89a703958039c6d9ea640cbc2b248c10679d8bd3",
-                    "stateRoot" : "0x006d371e0ca32f024cad32fcc2146861d069b2c51a23f06705d4c863f136fc73",
+                    "receiptTrie" : "0x2ccdbac5b89917d87863735ddbdb705c812687214c8dbfa56aa6f1c6ef47c435",
+                    "stateRoot" : "0x446023ede3a75b89bf0e6afb329856fe1d6fec22c615eacc8fd9bb9e875deb8e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0006d371e0ca32f024cad32fcc2146861d069b2c51a23f06705d4c863f136fc73a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda0f68abed6ce6d9556257dc58e89a703958039c6d9ea640cbc2b248c10679d8bd3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808393b6108203e880a0b0dc4831c6e9346ecf6bac01088ff99dd13571d34e6eea437f2dd28f341d081488b87f2c5e247589f4f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a07e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0446023ede3a75b89bf0e6afb329856fe1d6fec22c615eacc8fd9bb9e875deb8ea0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda02ccdbac5b89917d87863735ddbdb705c812687214c8dbfa56aa6f1c6ef47c435b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808393b6108203e880a00ed6604e8bcce2783b9c2ca0a5e79cc6d9014bc0487835feca94bf3b9b42211188d179f84c6b969cb0f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06691f67aacda006b564c4fc4773e6cb6a0c8b170587ea4438d7a5986a37915c6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x06585c5104373d785b32785017284d2fb488ca1d3c9373151ae9a5fd344482f6",
-        "network" : "EIP150",
+        "lastblockhash" : "0x05f19e6e8cc1bec51eead804499fb49ab1d9d5ca54204d8683c7c99afccf436b",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x456391824587b610",
                 "code" : "",
@@ -120,10 +127,138 @@
             }
         }
     },
-    "LoopCallsThenRevert_d0g0v0_EIP158" : {
+    "LoopCallsThenRevert_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/LoopCallsThenRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x93b610",
+                    "hash" : "0x58e063bd3db4d60b760f354d90b835376d218234649d61a908c63f125174eecd",
+                    "mixHash" : "0xe200e159d234e4516a07efaf6b780d1cce6b13a9479a623df0015271b7df94d0",
+                    "nonce" : "0xbd7d646ebbb96f78",
+                    "number" : "0x01",
+                    "parentHash" : "0x7e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1ac",
+                    "receiptTrie" : "0x2ccdbac5b89917d87863735ddbdb705c812687214c8dbfa56aa6f1c6ef47c435",
+                    "stateRoot" : "0x446023ede3a75b89bf0e6afb329856fe1d6fec22c615eacc8fd9bb9e875deb8e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a07e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0446023ede3a75b89bf0e6afb329856fe1d6fec22c615eacc8fd9bb9e875deb8ea0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda02ccdbac5b89917d87863735ddbdb705c812687214c8dbfa56aa6f1c6ef47c435b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808393b6108203e880a0e200e159d234e4516a07efaf6b780d1cce6b13a9479a623df0015271b7df94d088bd7d646ebbb96f78f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x989680",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88",
+                        "s" : "0x13761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x7e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1ac",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6691f67aacda006b564c4fc4773e6cb6a0c8b170587ea4438d7a5986a37915c6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06691f67aacda006b564c4fc4773e6cb6a0c8b170587ea4438d7a5986a37915c6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x58e063bd3db4d60b760f354d90b835376d218234649d61a908c63f125174eecd",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x456391824587b610",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x5b6001600054036000556000600060006000600073b00000000000000000000000000000000000000061c350f150600054600057",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d41159f0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600054600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x0352"
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x5b6001600054036000556000600060006000600073b00000000000000000000000000000000000000061c350f150600054600057",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x0352"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600054600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "LoopCallsThenRevert_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/stRevertTest/LoopCallsThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,9 +270,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x93b610",
-                    "hash" : "0xe2047fe473eea40a1cc2b3ce2994480132d317958efbc1796d91c95fc39c3d76",
-                    "mixHash" : "0x26915e2dcf2eab62081806bc5d1ce2f87643bdb7128ef77ca1762847936dfa0a",
-                    "nonce" : "0x3fb988931e600713",
+                    "hash" : "0xdd3af22493463ec29330b999060e021b3ca808d7d303e99ac4842eab665c7252",
+                    "mixHash" : "0xf90f6aa7f8aeb7b492ed2caccbcd1be9aee2eb72780e9bfdcfa160fba6f3a383",
+                    "nonce" : "0xfab0860fe53885ea",
                     "number" : "0x01",
                     "parentHash" : "0x7e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1ac",
                     "receiptTrie" : "0xf68abed6ce6d9556257dc58e89a703958039c6d9ea640cbc2b248c10679d8bd3",
@@ -146,7 +281,7 @@
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0006d371e0ca32f024cad32fcc2146861d069b2c51a23f06705d4c863f136fc73a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda0f68abed6ce6d9556257dc58e89a703958039c6d9ea640cbc2b248c10679d8bd3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808393b6108203e880a026915e2dcf2eab62081806bc5d1ce2f87643bdb7128ef77ca1762847936dfa0a883fb988931e600713f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a07e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0006d371e0ca32f024cad32fcc2146861d069b2c51a23f06705d4c863f136fc73a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda0f68abed6ce6d9556257dc58e89a703958039c6d9ea640cbc2b248c10679d8bd3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808393b6108203e880a0f90f6aa7f8aeb7b492ed2caccbcd1be9aee2eb72780e9bfdcfa160fba6f3a38388fab0860fe53885eaf862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,8 +318,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06691f67aacda006b564c4fc4773e6cb6a0c8b170587ea4438d7a5986a37915c6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe2047fe473eea40a1cc2b3ce2994480132d317958efbc1796d91c95fc39c3d76",
-        "network" : "EIP158",
+        "lastblockhash" : "0xdd3af22493463ec29330b999060e021b3ca808d7d303e99ac4842eab665c7252",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x456391824587b610",
@@ -241,10 +376,10 @@
             }
         }
     },
-    "LoopCallsThenRevert_d0g0v0_Frontier" : {
+    "LoopCallsThenRevert_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/stRevertTest/LoopCallsThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -255,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x855084",
-                    "hash" : "0x94cc809885404f9635921186139bd8ed2f4143c5cc1479b7792afd5f15d462b7",
-                    "mixHash" : "0x8adc8c965eb4043f45ce81acb45dc47ea91ea7a0958ba89da5fa21b84a166def",
-                    "nonce" : "0x68787da146d82ac6",
+                    "gasUsed" : "0x93b610",
+                    "hash" : "0x6ff70769b74ba1b2116b15dc58a36dd34ecf1a527451834b31a523a8f004e4e1",
+                    "mixHash" : "0xac482a899b86a1bfe1060b5cd45857f14ba09231022d3e97fa10cdca70139005",
+                    "nonce" : "0x254a95b232b40168",
                     "number" : "0x01",
                     "parentHash" : "0x7e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1ac",
-                    "receiptTrie" : "0xaf81a84f0d4e00c732f698981b78a99603040a30e626b5f1e3ff338393760ec2",
-                    "stateRoot" : "0xc2ad1f607b6185721bd654a478595536c3163adc5156b278aeace1b4f72cc841",
+                    "receiptTrie" : "0xf68abed6ce6d9556257dc58e89a703958039c6d9ea640cbc2b248c10679d8bd3",
+                    "stateRoot" : "0x006d371e0ca32f024cad32fcc2146861d069b2c51a23f06705d4c863f136fc73",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2ad1f607b6185721bd654a478595536c3163adc5156b278aeace1b4f72cc841a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda0af81a84f0d4e00c732f698981b78a99603040a30e626b5f1e3ff338393760ec2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838550848203e880a08adc8c965eb4043f45ce81acb45dc47ea91ea7a0958ba89da5fa21b84a166def8868787da146d82ac6f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a07e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0006d371e0ca32f024cad32fcc2146861d069b2c51a23f06705d4c863f136fc73a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda0f68abed6ce6d9556257dc58e89a703958039c6d9ea640cbc2b248c10679d8bd3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808393b6108203e880a0ac482a899b86a1bfe1060b5cd45857f14ba09231022d3e97fa10cdca7013900588254a95b232b40168f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,11 +439,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06691f67aacda006b564c4fc4773e6cb6a0c8b170587ea4438d7a5986a37915c6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x94cc809885404f9635921186139bd8ed2f4143c5cc1479b7792afd5f15d462b7",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6ff70769b74ba1b2116b15dc58a36dd34ecf1a527451834b31a523a8f004e4e1",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918245795084",
+                "balance" : "0x456391824587b610",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -322,7 +457,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d41fbf7c",
+                "balance" : "0xe8d41159f0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -362,10 +497,10 @@
             }
         }
     },
-    "LoopCallsThenRevert_d0g0v0_Homestead" : {
+    "LoopCallsThenRevert_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/stRevertTest/LoopCallsThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +512,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x855084",
-                    "hash" : "0x4018e0bdd3eebe223175063a537e1720874bad29538559875bc6032613cbb286",
-                    "mixHash" : "0xbd2eab6b17aac60ed536be9876758e96ed25eace7d6659b59361054ddb6d79ec",
-                    "nonce" : "0xa096e39210af56a4",
+                    "hash" : "0xfa2485ab085b2a4856ee935f5dde856beb4fda959b95d9e8112ab5a92f14fddd",
+                    "mixHash" : "0x5a6d7db12bc433b0b0fce8d27a5057fa96f545ab8198db190d83c41202d7e3ae",
+                    "nonce" : "0xc0bb25fb0c5cc1d0",
                     "number" : "0x01",
                     "parentHash" : "0x7e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1ac",
                     "receiptTrie" : "0xaf81a84f0d4e00c732f698981b78a99603040a30e626b5f1e3ff338393760ec2",
@@ -388,7 +523,7 @@
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2ad1f607b6185721bd654a478595536c3163adc5156b278aeace1b4f72cc841a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda0af81a84f0d4e00c732f698981b78a99603040a30e626b5f1e3ff338393760ec2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838550848203e880a0bd2eab6b17aac60ed536be9876758e96ed25eace7d6659b59361054ddb6d79ec88a096e39210af56a4f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a07e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2ad1f607b6185721bd654a478595536c3163adc5156b278aeace1b4f72cc841a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda0af81a84f0d4e00c732f698981b78a99603040a30e626b5f1e3ff338393760ec2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838550848203e880a05a6d7db12bc433b0b0fce8d27a5057fa96f545ab8198db190d83c41202d7e3ae88c0bb25fb0c5cc1d0f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +560,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06691f67aacda006b564c4fc4773e6cb6a0c8b170587ea4438d7a5986a37915c6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4018e0bdd3eebe223175063a537e1720874bad29538559875bc6032613cbb286",
-        "network" : "Homestead",
+        "lastblockhash" : "0xfa2485ab085b2a4856ee935f5dde856beb4fda959b95d9e8112ab5a92f14fddd",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918245795084",
@@ -483,10 +618,10 @@
             }
         }
     },
-    "LoopCallsThenRevert_d0g0v0_Metropolis" : {
+    "LoopCallsThenRevert_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/LoopCallsThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -497,19 +632,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x93b610",
-                    "hash" : "0x4dc3e0ff71d3cfa3d49a10b7db201bea543f5d72b3179860adda3b41f2644933",
-                    "mixHash" : "0x1cac206cf3162423e67e1f1859e7a50834ed2657214c62b4c9855c61638e958c",
-                    "nonce" : "0x802809bd90b8551b",
+                    "gasUsed" : "0x855084",
+                    "hash" : "0x652289dab1f03b266fc499ba2f202237ac32fad1b640eeb9115fb367ac50c39a",
+                    "mixHash" : "0x06e01e75f10da1c0f9a9460cd90e13bae38b371647477cb82e04614c6c7ed06c",
+                    "nonce" : "0x8c2b1a1090e975fc",
                     "number" : "0x01",
                     "parentHash" : "0x7e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1ac",
-                    "receiptTrie" : "0x2ccdbac5b89917d87863735ddbdb705c812687214c8dbfa56aa6f1c6ef47c435",
-                    "stateRoot" : "0x446023ede3a75b89bf0e6afb329856fe1d6fec22c615eacc8fd9bb9e875deb8e",
+                    "receiptTrie" : "0xaf81a84f0d4e00c732f698981b78a99603040a30e626b5f1e3ff338393760ec2",
+                    "stateRoot" : "0xc2ad1f607b6185721bd654a478595536c3163adc5156b278aeace1b4f72cc841",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0446023ede3a75b89bf0e6afb329856fe1d6fec22c615eacc8fd9bb9e875deb8ea0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda02ccdbac5b89917d87863735ddbdb705c812687214c8dbfa56aa6f1c6ef47c435b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808393b6108203e880a01cac206cf3162423e67e1f1859e7a50834ed2657214c62b4c9855c61638e958c88802809bd90b8551bf862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a07e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2ad1f607b6185721bd654a478595536c3163adc5156b278aeace1b4f72cc841a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda0af81a84f0d4e00c732f698981b78a99603040a30e626b5f1e3ff338393760ec2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838550848203e880a006e01e75f10da1c0f9a9460cd90e13bae38b371647477cb82e04614c6c7ed06c888c2b1a1090e975fcf862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -546,18 +681,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06691f67aacda006b564c4fc4773e6cb6a0c8b170587ea4438d7a5986a37915c6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4dc3e0ff71d3cfa3d49a10b7db201bea543f5d72b3179860adda3b41f2644933",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x652289dab1f03b266fc499ba2f202237ac32fad1b640eeb9115fb367ac50c39a",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824587b610",
+                "balance" : "0x4563918245795084",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -571,7 +699,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d41159f0",
+                "balance" : "0xe8d41fbf7c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/LoopCallsThenRevert_d0g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/LoopCallsThenRevert_d0g1v0.json
index 638170f61..eda2a320d 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/LoopCallsThenRevert_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/LoopCallsThenRevert_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "LoopCallsThenRevert_d0g1v0_EIP150" : {
+    "LoopCallsThenRevert_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/LoopCallsThenRevert_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x895440",
-                    "hash" : "0x90de34b4f3a83ab1693e1a67f4cf0934597294daee5647c5667e11b56ffead9f",
-                    "mixHash" : "0xfe62e1c36da1a6fe50501cad29202ae6d7b07b4020954284d2a480b32ab517d5",
-                    "nonce" : "0xac624dd93dbb751a",
+                    "hash" : "0x5d3b35631279e1ed2291e73c8856ff65da7286499fe058fbf1cf49b845211789",
+                    "mixHash" : "0x48bb7daca8b44da916437648651e513ab6b055b17ad66bcbe35900ff80a353c9",
+                    "nonce" : "0xf535e7e80218b58c",
                     "number" : "0x01",
                     "parentHash" : "0x7e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1ac",
-                    "receiptTrie" : "0x087348a046530c07838b766ec595bb7fe8af2d6c134fdc830b1fbb8358411674",
-                    "stateRoot" : "0xde7a443ea12f26b999a522ca49e4d16be1669189a6e04c2437a345975bc03f8d",
+                    "receiptTrie" : "0x822a08a9209518492efc2d90af14952219ef28fb999769eb120506ece51bad7c",
+                    "stateRoot" : "0x90c07f40831116895fb98fea79052647d17aaefbd8d17a739d6ac4ac4c4611ae",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3cbaba5ad67d550f279077bbde7bd83e63eb3a70acc63067efb0e515b259c444",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de7a443ea12f26b999a522ca49e4d16be1669189a6e04c2437a345975bc03f8da03cbaba5ad67d550f279077bbde7bd83e63eb3a70acc63067efb0e515b259c444a0087348a046530c07838b766ec595bb7fe8af2d6c134fdc830b1fbb8358411674b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838954408203e880a0fe62e1c36da1a6fe50501cad29202ae6d7b07b4020954284d2a480b32ab517d588ac624dd93dbb751af862f86080018389544094a00000000000000000000000000000000000000080801ca0381df6b080ee09950ffff55cb01f9e4415d2f53d9d295c36546b8bfc059e5e78a0337620d421c3d8ae89ba982e15e495501af43d9ae15436f9df9f35aae47a4738c0",
+                "rlp" : "0xf90260f901f8a07e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090c07f40831116895fb98fea79052647d17aaefbd8d17a739d6ac4ac4c4611aea03cbaba5ad67d550f279077bbde7bd83e63eb3a70acc63067efb0e515b259c444a0822a08a9209518492efc2d90af14952219ef28fb999769eb120506ece51bad7cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838954408203e880a048bb7daca8b44da916437648651e513ab6b055b17ad66bcbe35900ff80a353c988f535e7e80218b58cf862f86080018389544094a00000000000000000000000000000000000000080801ca0381df6b080ee09950ffff55cb01f9e4415d2f53d9d295c36546b8bfc059e5e78a0337620d421c3d8ae89ba982e15e495501af43d9ae15436f9df9f35aae47a4738c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06691f67aacda006b564c4fc4773e6cb6a0c8b170587ea4438d7a5986a37915c6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x90de34b4f3a83ab1693e1a67f4cf0934597294daee5647c5667e11b56ffead9f",
-        "network" : "EIP150",
+        "lastblockhash" : "0x5d3b35631279e1ed2291e73c8856ff65da7286499fe058fbf1cf49b845211789",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x45639182457d5440",
                 "code" : "",
@@ -120,10 +127,138 @@
             }
         }
     },
-    "LoopCallsThenRevert_d0g1v0_EIP158" : {
+    "LoopCallsThenRevert_d0g1v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/LoopCallsThenRevert_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x895440",
+                    "hash" : "0x1be9cc9ddeb9fb4c599629ca769bea4b3fdfee23a55a0940241ce2922188a649",
+                    "mixHash" : "0x4ac4e5bd5a6b885250d66826475a1937e1033ee285a8ddee191560e9870e9df6",
+                    "nonce" : "0x073427cf82b807e0",
+                    "number" : "0x01",
+                    "parentHash" : "0x7e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1ac",
+                    "receiptTrie" : "0x822a08a9209518492efc2d90af14952219ef28fb999769eb120506ece51bad7c",
+                    "stateRoot" : "0x90c07f40831116895fb98fea79052647d17aaefbd8d17a739d6ac4ac4c4611ae",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3cbaba5ad67d550f279077bbde7bd83e63eb3a70acc63067efb0e515b259c444",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a07e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090c07f40831116895fb98fea79052647d17aaefbd8d17a739d6ac4ac4c4611aea03cbaba5ad67d550f279077bbde7bd83e63eb3a70acc63067efb0e515b259c444a0822a08a9209518492efc2d90af14952219ef28fb999769eb120506ece51bad7cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838954408203e880a04ac4e5bd5a6b885250d66826475a1937e1033ee285a8ddee191560e9870e9df688073427cf82b807e0f862f86080018389544094a00000000000000000000000000000000000000080801ca0381df6b080ee09950ffff55cb01f9e4415d2f53d9d295c36546b8bfc059e5e78a0337620d421c3d8ae89ba982e15e495501af43d9ae15436f9df9f35aae47a4738c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x895440",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x381df6b080ee09950ffff55cb01f9e4415d2f53d9d295c36546b8bfc059e5e78",
+                        "s" : "0x337620d421c3d8ae89ba982e15e495501af43d9ae15436f9df9f35aae47a4738",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x7e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1ac",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6691f67aacda006b564c4fc4773e6cb6a0c8b170587ea4438d7a5986a37915c6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06691f67aacda006b564c4fc4773e6cb6a0c8b170587ea4438d7a5986a37915c6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1be9cc9ddeb9fb4c599629ca769bea4b3fdfee23a55a0940241ce2922188a649",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x45639182457d5440",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x5b6001600054036000556000600060006000600073b00000000000000000000000000000000000000061c350f150600054600057",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x0352"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d41bbbc0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600054600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x5b6001600054036000556000600060006000600073b00000000000000000000000000000000000000061c350f150600054600057",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x0352"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600054600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "LoopCallsThenRevert_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/LoopCallsThenRevert_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -135,9 +270,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x895440",
-                    "hash" : "0xb1a7b7630574244dccf738d03c37305ec12271c137e86ead372972d028acb229",
-                    "mixHash" : "0x7c166e99b47367dcf797e3d51ed1c65e5bdcd10502cfc68ef0ed5954fabd6f87",
-                    "nonce" : "0x95b43661ef03abfd",
+                    "hash" : "0x89c7709508b082ef15768bf4c4b3de31c3e82dc9b6c83be25f2d2a64486a9dd2",
+                    "mixHash" : "0x0d18b0d500dcc36838bc4691a2f213f20dcaf5119b610736683bd7d3bb525aeb",
+                    "nonce" : "0x156a95d8e038242e",
                     "number" : "0x01",
                     "parentHash" : "0x7e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1ac",
                     "receiptTrie" : "0x087348a046530c07838b766ec595bb7fe8af2d6c134fdc830b1fbb8358411674",
@@ -146,7 +281,7 @@
                     "transactionsTrie" : "0x3cbaba5ad67d550f279077bbde7bd83e63eb3a70acc63067efb0e515b259c444",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de7a443ea12f26b999a522ca49e4d16be1669189a6e04c2437a345975bc03f8da03cbaba5ad67d550f279077bbde7bd83e63eb3a70acc63067efb0e515b259c444a0087348a046530c07838b766ec595bb7fe8af2d6c134fdc830b1fbb8358411674b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838954408203e880a07c166e99b47367dcf797e3d51ed1c65e5bdcd10502cfc68ef0ed5954fabd6f878895b43661ef03abfdf862f86080018389544094a00000000000000000000000000000000000000080801ca0381df6b080ee09950ffff55cb01f9e4415d2f53d9d295c36546b8bfc059e5e78a0337620d421c3d8ae89ba982e15e495501af43d9ae15436f9df9f35aae47a4738c0",
+                "rlp" : "0xf90260f901f8a07e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de7a443ea12f26b999a522ca49e4d16be1669189a6e04c2437a345975bc03f8da03cbaba5ad67d550f279077bbde7bd83e63eb3a70acc63067efb0e515b259c444a0087348a046530c07838b766ec595bb7fe8af2d6c134fdc830b1fbb8358411674b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838954408203e880a00d18b0d500dcc36838bc4691a2f213f20dcaf5119b610736683bd7d3bb525aeb88156a95d8e038242ef862f86080018389544094a00000000000000000000000000000000000000080801ca0381df6b080ee09950ffff55cb01f9e4415d2f53d9d295c36546b8bfc059e5e78a0337620d421c3d8ae89ba982e15e495501af43d9ae15436f9df9f35aae47a4738c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,8 +318,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06691f67aacda006b564c4fc4773e6cb6a0c8b170587ea4438d7a5986a37915c6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb1a7b7630574244dccf738d03c37305ec12271c137e86ead372972d028acb229",
-        "network" : "EIP158",
+        "lastblockhash" : "0x89c7709508b082ef15768bf4c4b3de31c3e82dc9b6c83be25f2d2a64486a9dd2",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x45639182457d5440",
@@ -241,10 +376,10 @@
             }
         }
     },
-    "LoopCallsThenRevert_d0g1v0_Frontier" : {
+    "LoopCallsThenRevert_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/LoopCallsThenRevert_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -255,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x855084",
-                    "hash" : "0x5453194c8bca19312b7ed9739448039b6a7d342a5e0ab78c303047db6c58ca83",
-                    "mixHash" : "0x1ec164f516a428361a496f27685d635d68fff90fa394d40ec13e61e1ef24a2e6",
-                    "nonce" : "0xff011fc3008a1089",
+                    "gasUsed" : "0x895440",
+                    "hash" : "0xefb371216891e5cc6149420b021cbfad6f8dd61bd15f05c78a959cd85c6f16c6",
+                    "mixHash" : "0x802f21e9b80767602c95dec5d18095e32dd3c1cd4dc216d58902b12305d1c085",
+                    "nonce" : "0x61ea7f52b425c8b1",
                     "number" : "0x01",
                     "parentHash" : "0x7e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1ac",
-                    "receiptTrie" : "0xaf81a84f0d4e00c732f698981b78a99603040a30e626b5f1e3ff338393760ec2",
-                    "stateRoot" : "0xc2ad1f607b6185721bd654a478595536c3163adc5156b278aeace1b4f72cc841",
+                    "receiptTrie" : "0x087348a046530c07838b766ec595bb7fe8af2d6c134fdc830b1fbb8358411674",
+                    "stateRoot" : "0xde7a443ea12f26b999a522ca49e4d16be1669189a6e04c2437a345975bc03f8d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3cbaba5ad67d550f279077bbde7bd83e63eb3a70acc63067efb0e515b259c444",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2ad1f607b6185721bd654a478595536c3163adc5156b278aeace1b4f72cc841a03cbaba5ad67d550f279077bbde7bd83e63eb3a70acc63067efb0e515b259c444a0af81a84f0d4e00c732f698981b78a99603040a30e626b5f1e3ff338393760ec2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838550848203e880a01ec164f516a428361a496f27685d635d68fff90fa394d40ec13e61e1ef24a2e688ff011fc3008a1089f862f86080018389544094a00000000000000000000000000000000000000080801ca0381df6b080ee09950ffff55cb01f9e4415d2f53d9d295c36546b8bfc059e5e78a0337620d421c3d8ae89ba982e15e495501af43d9ae15436f9df9f35aae47a4738c0",
+                "rlp" : "0xf90260f901f8a07e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de7a443ea12f26b999a522ca49e4d16be1669189a6e04c2437a345975bc03f8da03cbaba5ad67d550f279077bbde7bd83e63eb3a70acc63067efb0e515b259c444a0087348a046530c07838b766ec595bb7fe8af2d6c134fdc830b1fbb8358411674b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838954408203e880a0802f21e9b80767602c95dec5d18095e32dd3c1cd4dc216d58902b12305d1c0858861ea7f52b425c8b1f862f86080018389544094a00000000000000000000000000000000000000080801ca0381df6b080ee09950ffff55cb01f9e4415d2f53d9d295c36546b8bfc059e5e78a0337620d421c3d8ae89ba982e15e495501af43d9ae15436f9df9f35aae47a4738c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,11 +439,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06691f67aacda006b564c4fc4773e6cb6a0c8b170587ea4438d7a5986a37915c6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5453194c8bca19312b7ed9739448039b6a7d342a5e0ab78c303047db6c58ca83",
-        "network" : "Frontier",
+        "lastblockhash" : "0xefb371216891e5cc6149420b021cbfad6f8dd61bd15f05c78a959cd85c6f16c6",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918245795084",
+                "balance" : "0x45639182457d5440",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -319,10 +454,11 @@
                 "code" : "0x5b6001600054036000556000600060006000600073b00000000000000000000000000000000000000061c350f150600054600057",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x0352"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d41fbf7c",
+                "balance" : "0xe8d41bbbc0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -333,7 +469,6 @@
                 "code" : "0x600054600101600055",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x0352"
                 }
             }
         },
@@ -362,10 +497,10 @@
             }
         }
     },
-    "LoopCallsThenRevert_d0g1v0_Homestead" : {
+    "LoopCallsThenRevert_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/LoopCallsThenRevert_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +512,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x855084",
-                    "hash" : "0x9a17384af5e3609d4ced7510baf64c67657715c659a284905b6f9b6a610a1008",
-                    "mixHash" : "0xbb132315e90a5077cd0e005a0e1c8915d7dce5aaa25364d4612dfed2e0e91d7f",
-                    "nonce" : "0x04fe940c65a9c38d",
+                    "hash" : "0x1926577d7c92cb4f13ccd759a4a271257c9e963bbe315335d33a4d60d726dafe",
+                    "mixHash" : "0x64b219186548c5e6501e336784d810351803fa212a33cbc9b5f9d5dfeb6b4b67",
+                    "nonce" : "0xc63c3ee821f88b0d",
                     "number" : "0x01",
                     "parentHash" : "0x7e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1ac",
                     "receiptTrie" : "0xaf81a84f0d4e00c732f698981b78a99603040a30e626b5f1e3ff338393760ec2",
@@ -388,7 +523,7 @@
                     "transactionsTrie" : "0x3cbaba5ad67d550f279077bbde7bd83e63eb3a70acc63067efb0e515b259c444",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2ad1f607b6185721bd654a478595536c3163adc5156b278aeace1b4f72cc841a03cbaba5ad67d550f279077bbde7bd83e63eb3a70acc63067efb0e515b259c444a0af81a84f0d4e00c732f698981b78a99603040a30e626b5f1e3ff338393760ec2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838550848203e880a0bb132315e90a5077cd0e005a0e1c8915d7dce5aaa25364d4612dfed2e0e91d7f8804fe940c65a9c38df862f86080018389544094a00000000000000000000000000000000000000080801ca0381df6b080ee09950ffff55cb01f9e4415d2f53d9d295c36546b8bfc059e5e78a0337620d421c3d8ae89ba982e15e495501af43d9ae15436f9df9f35aae47a4738c0",
+                "rlp" : "0xf90260f901f8a07e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2ad1f607b6185721bd654a478595536c3163adc5156b278aeace1b4f72cc841a03cbaba5ad67d550f279077bbde7bd83e63eb3a70acc63067efb0e515b259c444a0af81a84f0d4e00c732f698981b78a99603040a30e626b5f1e3ff338393760ec2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838550848203e880a064b219186548c5e6501e336784d810351803fa212a33cbc9b5f9d5dfeb6b4b6788c63c3ee821f88b0df862f86080018389544094a00000000000000000000000000000000000000080801ca0381df6b080ee09950ffff55cb01f9e4415d2f53d9d295c36546b8bfc059e5e78a0337620d421c3d8ae89ba982e15e495501af43d9ae15436f9df9f35aae47a4738c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +560,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06691f67aacda006b564c4fc4773e6cb6a0c8b170587ea4438d7a5986a37915c6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9a17384af5e3609d4ced7510baf64c67657715c659a284905b6f9b6a610a1008",
-        "network" : "Homestead",
+        "lastblockhash" : "0x1926577d7c92cb4f13ccd759a4a271257c9e963bbe315335d33a4d60d726dafe",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918245795084",
@@ -483,10 +618,10 @@
             }
         }
     },
-    "LoopCallsThenRevert_d0g1v0_Metropolis" : {
+    "LoopCallsThenRevert_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/LoopCallsThenRevert_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -497,19 +632,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x895440",
-                    "hash" : "0x66e0815f7201b00b13c2c87299a7a4a8222ee4231d9218ceea5985dff853dd6c",
-                    "mixHash" : "0xcb2098c22692353e44409b86940adcb6214161f2d32a4f18b015d78d66c61b54",
-                    "nonce" : "0xdcb5ef158e42ee2b",
+                    "gasUsed" : "0x855084",
+                    "hash" : "0x0b2c970f33d9ae8a5138c25cd455ce382d456003c53d961d19007ed69ec42a78",
+                    "mixHash" : "0xdc9bc4e434147583c05ab9aa88755690f78efe9f16a451c2498bdd3653e31fc8",
+                    "nonce" : "0x780c7955356fbc77",
                     "number" : "0x01",
                     "parentHash" : "0x7e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1ac",
-                    "receiptTrie" : "0x822a08a9209518492efc2d90af14952219ef28fb999769eb120506ece51bad7c",
-                    "stateRoot" : "0x90c07f40831116895fb98fea79052647d17aaefbd8d17a739d6ac4ac4c4611ae",
+                    "receiptTrie" : "0xaf81a84f0d4e00c732f698981b78a99603040a30e626b5f1e3ff338393760ec2",
+                    "stateRoot" : "0xc2ad1f607b6185721bd654a478595536c3163adc5156b278aeace1b4f72cc841",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3cbaba5ad67d550f279077bbde7bd83e63eb3a70acc63067efb0e515b259c444",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090c07f40831116895fb98fea79052647d17aaefbd8d17a739d6ac4ac4c4611aea03cbaba5ad67d550f279077bbde7bd83e63eb3a70acc63067efb0e515b259c444a0822a08a9209518492efc2d90af14952219ef28fb999769eb120506ece51bad7cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838954408203e880a0cb2098c22692353e44409b86940adcb6214161f2d32a4f18b015d78d66c61b5488dcb5ef158e42ee2bf862f86080018389544094a00000000000000000000000000000000000000080801ca0381df6b080ee09950ffff55cb01f9e4415d2f53d9d295c36546b8bfc059e5e78a0337620d421c3d8ae89ba982e15e495501af43d9ae15436f9df9f35aae47a4738c0",
+                "rlp" : "0xf90260f901f8a07e50ebf1e77b7cd40086ef5c0dc05282d4148419cd39dee85b45a0713e2bf1aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2ad1f607b6185721bd654a478595536c3163adc5156b278aeace1b4f72cc841a03cbaba5ad67d550f279077bbde7bd83e63eb3a70acc63067efb0e515b259c444a0af81a84f0d4e00c732f698981b78a99603040a30e626b5f1e3ff338393760ec2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838550848203e880a0dc9bc4e434147583c05ab9aa88755690f78efe9f16a451c2498bdd3653e31fc888780c7955356fbc77f862f86080018389544094a00000000000000000000000000000000000000080801ca0381df6b080ee09950ffff55cb01f9e4415d2f53d9d295c36546b8bfc059e5e78a0337620d421c3d8ae89ba982e15e495501af43d9ae15436f9df9f35aae47a4738c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -546,18 +681,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06691f67aacda006b564c4fc4773e6cb6a0c8b170587ea4438d7a5986a37915c6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x66e0815f7201b00b13c2c87299a7a4a8222ee4231d9218ceea5985dff853dd6c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x0b2c970f33d9ae8a5138c25cd455ce382d456003c53d961d19007ed69ec42a78",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x45639182457d5440",
+                "balance" : "0x4563918245795084",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -568,11 +696,10 @@
                 "code" : "0x5b6001600054036000556000600060006000600073b00000000000000000000000000000000000000061c350f150600054600057",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x0352"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d41bbbc0",
+                "balance" : "0xe8d41fbf7c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -583,6 +710,7 @@
                 "code" : "0x600054600101600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x0352"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/LoopDelegateCallsDepthThenRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/LoopDelegateCallsDepthThenRevert_d0g0v0.json
index 2dfa6335c..1b1f6018e 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/LoopDelegateCallsDepthThenRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/LoopDelegateCallsDepthThenRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "LoopDelegateCallsDepthThenRevert_d0g0v0_EIP150" : {
+    "LoopDelegateCallsDepthThenRevert_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/stRevertTest/LoopDelegateCallsDepthThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x13a00e",
-                    "hash" : "0x4b88d2e9b722c4542612439ef4ac53e32e1871ab3699f5dc820b68a8219f3db7",
-                    "mixHash" : "0xff48faea1a480339d61b5ec051e96f7df0b5cbf2e0dbfb125cea2d53d130ef3d",
-                    "nonce" : "0x1db36e8d6a3955da",
+                    "hash" : "0x0509bed2071ddbc6dc06c0ea832e109d1095102e96f8f6a0f31f94eb9d94c542",
+                    "mixHash" : "0xe29657328a658665d76447df7802f4d097c4cac69e66160996ceb403a663c605",
+                    "nonce" : "0x680a2f1e03835b9c",
                     "number" : "0x01",
                     "parentHash" : "0xc01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899",
-                    "receiptTrie" : "0x87312eea3107bfb4590c842e81d836aaebf59a6b38bcec208c42350c1f4072e3",
-                    "stateRoot" : "0x081b1465432f927e25e5e147c7280503b01cdc3f5b6b713365f917072b197aa2",
+                    "receiptTrie" : "0x32379353f2ffb1b0c728e8c7f25c4959de893c529ffdb32f461464ba685e326b",
+                    "stateRoot" : "0xcbacc835a51149abaeec1ecb75b920ad6f8ec58f4a2a9ee781011c2369e39d0e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0081b1465432f927e25e5e147c7280503b01cdc3f5b6b713365f917072b197aa2a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda087312eea3107bfb4590c842e81d836aaebf59a6b38bcec208c42350c1f4072e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313a00e8203e880a0ff48faea1a480339d61b5ec051e96f7df0b5cbf2e0dbfb125cea2d53d130ef3d881db36e8d6a3955daf862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a0c01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cbacc835a51149abaeec1ecb75b920ad6f8ec58f4a2a9ee781011c2369e39d0ea0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda032379353f2ffb1b0c728e8c7f25c4959de893c529ffdb32f461464ba685e326bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313a00e8203e880a0e29657328a658665d76447df7802f4d097c4cac69e66160996ceb403a663c60588680a2f1e03835b9cf862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf71cb39ec3c23f977652e411bfbdd7f485a011f8b4f557fa14ebc86436e758ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4b88d2e9b722c4542612439ef4ac53e32e1871ab3699f5dc820b68a8219f3db7",
-        "network" : "EIP150",
+        "lastblockhash" : "0x0509bed2071ddbc6dc06c0ea832e109d1095102e96f8f6a0f31f94eb9d94c542",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x456391824507a00e",
                 "code" : "",
@@ -119,10 +126,10 @@
             }
         }
     },
-    "LoopDelegateCallsDepthThenRevert_d0g0v0_EIP158" : {
+    "LoopDelegateCallsDepthThenRevert_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/stRevertTest/LoopDelegateCallsDepthThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -134,9 +141,136 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x13a00e",
-                    "hash" : "0xa9a027d861f8fa80d5934ebb59b21a7cae3784e3c9fab5b02bf787537c13b464",
-                    "mixHash" : "0x4c12e80b0ea3b887674dabea6cd6b242da28ad89b6b84b9df028c2667ce9cfe3",
-                    "nonce" : "0xbb739b8e74f40331",
+                    "hash" : "0x60177b7550887a29210a9d9af085ac9ebd793155d19fe89ef64409741797f620",
+                    "mixHash" : "0x75517b96fd034a33475f0b8cec10c02cc9e0b07c4a185f109fb6b4a53c2e8423",
+                    "nonce" : "0x7d8df40205e6c356",
+                    "number" : "0x01",
+                    "parentHash" : "0xc01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899",
+                    "receiptTrie" : "0x32379353f2ffb1b0c728e8c7f25c4959de893c529ffdb32f461464ba685e326b",
+                    "stateRoot" : "0xcbacc835a51149abaeec1ecb75b920ad6f8ec58f4a2a9ee781011c2369e39d0e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0c01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cbacc835a51149abaeec1ecb75b920ad6f8ec58f4a2a9ee781011c2369e39d0ea0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda032379353f2ffb1b0c728e8c7f25c4959de893c529ffdb32f461464ba685e326bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313a00e8203e880a075517b96fd034a33475f0b8cec10c02cc9e0b07c4a185f109fb6b4a53c2e8423887d8df40205e6c356f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x989680",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88",
+                        "s" : "0x13761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xc01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xcf71cb39ec3c23f977652e411bfbdd7f485a011f8b4f557fa14ebc86436e758b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf71cb39ec3c23f977652e411bfbdd7f485a011f8b4f557fa14ebc86436e758ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x60177b7550887a29210a9d9af085ac9ebd793155d19fe89ef64409741797f620",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x456391824507a00e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600160005401600055600060006000600073b0000000000000000000000000000000000000005af4",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xd2"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4916ff2",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600160005401600055600060006000600073a0000000000000000000000000000000000000005af4",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600160005401600055600060006000600073b0000000000000000000000000000000000000005af4",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600160005401600055600060006000600073a0000000000000000000000000000000000000005af4",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "LoopDelegateCallsDepthThenRevert_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/LoopDelegateCallsDepthThenRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x13a00e",
+                    "hash" : "0xc839af1a7d6444d018c0daca86b33e92d28a56666c4357de67cfc278a0d7cdfd",
+                    "mixHash" : "0x3030fc9a28f041b53e4ca76f8e687f7f18e804daad6d97a89b53db8a41675400",
+                    "nonce" : "0xa65e99f56bad0c4a",
                     "number" : "0x01",
                     "parentHash" : "0xc01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899",
                     "receiptTrie" : "0x87312eea3107bfb4590c842e81d836aaebf59a6b38bcec208c42350c1f4072e3",
@@ -145,7 +279,7 @@
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0081b1465432f927e25e5e147c7280503b01cdc3f5b6b713365f917072b197aa2a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda087312eea3107bfb4590c842e81d836aaebf59a6b38bcec208c42350c1f4072e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313a00e8203e880a04c12e80b0ea3b887674dabea6cd6b242da28ad89b6b84b9df028c2667ce9cfe388bb739b8e74f40331f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a0c01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0081b1465432f927e25e5e147c7280503b01cdc3f5b6b713365f917072b197aa2a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda087312eea3107bfb4590c842e81d836aaebf59a6b38bcec208c42350c1f4072e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313a00e8203e880a03030fc9a28f041b53e4ca76f8e687f7f18e804daad6d97a89b53db8a4167540088a65e99f56bad0c4af862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -182,8 +316,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf71cb39ec3c23f977652e411bfbdd7f485a011f8b4f557fa14ebc86436e758ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa9a027d861f8fa80d5934ebb59b21a7cae3784e3c9fab5b02bf787537c13b464",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc839af1a7d6444d018c0daca86b33e92d28a56666c4357de67cfc278a0d7cdfd",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x456391824507a00e",
@@ -239,10 +373,10 @@
             }
         }
     },
-    "LoopDelegateCallsDepthThenRevert_d0g0v0_Frontier" : {
+    "LoopDelegateCallsDepthThenRevert_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/stRevertTest/LoopDelegateCallsDepthThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -253,19 +387,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x989680",
-                    "hash" : "0x04040c50c6a7a3492855d69df82155038e550db4df9490f2444b7e9afb62e8db",
-                    "mixHash" : "0xfc76b894ee0ee07f28324c6d5ce24395a92339ac1ece8cc38626b22ca58ad0e3",
-                    "nonce" : "0x471a2aeabb00cd56",
+                    "gasUsed" : "0x13a00e",
+                    "hash" : "0x832935ee4fcba4bb803b3e761a36c62eb91af811f3526e9c507501bc3e6c3df6",
+                    "mixHash" : "0x35dda6e7b00a9e3c4105ac7a66af6a71c876c94a85b6dda403b950f24a38e735",
+                    "nonce" : "0xf6bc5defb6968e54",
                     "number" : "0x01",
                     "parentHash" : "0xc01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899",
-                    "receiptTrie" : "0x272050fda7872565ab24f9407b1ff38e0fd8f3ebe0ea800e527530c8587efc50",
-                    "stateRoot" : "0x7076212ffc477132c9b41120f22b2b951daa536529346ed02811f68893e6c695",
+                    "receiptTrie" : "0x87312eea3107bfb4590c842e81d836aaebf59a6b38bcec208c42350c1f4072e3",
+                    "stateRoot" : "0x081b1465432f927e25e5e147c7280503b01cdc3f5b6b713365f917072b197aa2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07076212ffc477132c9b41120f22b2b951daa536529346ed02811f68893e6c695a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda0272050fda7872565ab24f9407b1ff38e0fd8f3ebe0ea800e527530c8587efc50b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680839896808203e880a0fc76b894ee0ee07f28324c6d5ce24395a92339ac1ece8cc38626b22ca58ad0e388471a2aeabb00cd56f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a0c01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0081b1465432f927e25e5e147c7280503b01cdc3f5b6b713365f917072b197aa2a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda087312eea3107bfb4590c842e81d836aaebf59a6b38bcec208c42350c1f4072e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313a00e8203e880a035dda6e7b00a9e3c4105ac7a66af6a71c876c94a85b6dda403b950f24a38e73588f6bc5defb6968e54f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -302,11 +436,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf71cb39ec3c23f977652e411bfbdd7f485a011f8b4f557fa14ebc86436e758ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x04040c50c6a7a3492855d69df82155038e550db4df9490f2444b7e9afb62e8db",
-        "network" : "Frontier",
+        "lastblockhash" : "0x832935ee4fcba4bb803b3e761a36c62eb91af811f3526e9c507501bc3e6c3df6",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x45639182458c9680",
+                "balance" : "0x456391824507a00e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -317,10 +451,11 @@
                 "code" : "0x600160005401600055600060006000600073b0000000000000000000000000000000000000005af4",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0xd2"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d40c7980",
+                "balance" : "0xe8d4916ff2",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -358,10 +493,10 @@
             }
         }
     },
-    "LoopDelegateCallsDepthThenRevert_d0g0v0_Homestead" : {
+    "LoopDelegateCallsDepthThenRevert_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/stRevertTest/LoopDelegateCallsDepthThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -373,9 +508,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x989680",
-                    "hash" : "0xc155bf2a126127446fd5ac18b3593069ba25cc12d7c190a14e66ae72c6ce3680",
-                    "mixHash" : "0xb9d5e21cf358c1eb594718ebb7d190cf351c8b852bf1f8741a01f2f8aff8d372",
-                    "nonce" : "0x38d4c2b7f01c196d",
+                    "hash" : "0xc8dd0b66af17afb317b1f9e152d511cfcec7ec6deed72009976bd53020caec46",
+                    "mixHash" : "0xccf8a4c6c27b20cbb5b6a00c1d23f73123d9d5755e7533171483776be796e11f",
+                    "nonce" : "0xfd0de846c38ea0cf",
                     "number" : "0x01",
                     "parentHash" : "0xc01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899",
                     "receiptTrie" : "0x272050fda7872565ab24f9407b1ff38e0fd8f3ebe0ea800e527530c8587efc50",
@@ -384,7 +519,7 @@
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07076212ffc477132c9b41120f22b2b951daa536529346ed02811f68893e6c695a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda0272050fda7872565ab24f9407b1ff38e0fd8f3ebe0ea800e527530c8587efc50b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680839896808203e880a0b9d5e21cf358c1eb594718ebb7d190cf351c8b852bf1f8741a01f2f8aff8d3728838d4c2b7f01c196df862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a0c01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07076212ffc477132c9b41120f22b2b951daa536529346ed02811f68893e6c695a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda0272050fda7872565ab24f9407b1ff38e0fd8f3ebe0ea800e527530c8587efc50b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680839896808203e880a0ccf8a4c6c27b20cbb5b6a00c1d23f73123d9d5755e7533171483776be796e11f88fd0de846c38ea0cff862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -421,8 +556,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf71cb39ec3c23f977652e411bfbdd7f485a011f8b4f557fa14ebc86436e758ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc155bf2a126127446fd5ac18b3593069ba25cc12d7c190a14e66ae72c6ce3680",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc8dd0b66af17afb317b1f9e152d511cfcec7ec6deed72009976bd53020caec46",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x45639182458c9680",
@@ -477,10 +612,10 @@
             }
         }
     },
-    "LoopDelegateCallsDepthThenRevert_d0g0v0_Metropolis" : {
+    "LoopDelegateCallsDepthThenRevert_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/LoopDelegateCallsDepthThenRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -491,19 +626,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x13a00e",
-                    "hash" : "0x697ab6995920f38b463d997a2051be02b0e80cf772a3206ceb59f5feaa640d03",
-                    "mixHash" : "0x1565ba778a50bf5f08778428d70b2b45f9ba2e181ea9a665f61df9f18e65274f",
-                    "nonce" : "0xa2fa7f707d854e2c",
+                    "gasUsed" : "0x989680",
+                    "hash" : "0xec6adb5912c5d641e56d4a3ec1e1cf687760c17505abc9890260e0bff132785b",
+                    "mixHash" : "0xfaed5703bcb1b9910d72182ca46d31aba313cca72fa4af3ac0dd6e39679fad31",
+                    "nonce" : "0xc8fb8570ba5dd1c3",
                     "number" : "0x01",
                     "parentHash" : "0xc01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899",
-                    "receiptTrie" : "0x32379353f2ffb1b0c728e8c7f25c4959de893c529ffdb32f461464ba685e326b",
-                    "stateRoot" : "0xcbacc835a51149abaeec1ecb75b920ad6f8ec58f4a2a9ee781011c2369e39d0e",
+                    "receiptTrie" : "0x272050fda7872565ab24f9407b1ff38e0fd8f3ebe0ea800e527530c8587efc50",
+                    "stateRoot" : "0x7076212ffc477132c9b41120f22b2b951daa536529346ed02811f68893e6c695",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cbacc835a51149abaeec1ecb75b920ad6f8ec58f4a2a9ee781011c2369e39d0ea0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda032379353f2ffb1b0c728e8c7f25c4959de893c529ffdb32f461464ba685e326bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808313a00e8203e880a01565ba778a50bf5f08778428d70b2b45f9ba2e181ea9a665f61df9f18e65274f88a2fa7f707d854e2cf862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
+                "rlp" : "0xf90260f901f8a0c01df88cb85f4ed3391fc223ef6ba2c1ea2b30c94af9a37ae57d21cc8a2a3899a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07076212ffc477132c9b41120f22b2b951daa536529346ed02811f68893e6c695a0b2729e33980e9274af9f87de09b0519d4963aef90463b8591fa31b118bd580bda0272050fda7872565ab24f9407b1ff38e0fd8f3ebe0ea800e527530c8587efc50b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680839896808203e880a0faed5703bcb1b9910d72182ca46d31aba313cca72fa4af3ac0dd6e39679fad3188c8fb8570ba5dd1c3f862f86080018398968094a00000000000000000000000000000000000000080801ca0dcd5b853a2284133e6c3ee9b97192fd899fdb54bec7412cdf053062374b6dd88a013761e2b5467dbaa3687ef35fbf6d0ad6cfb5f7f744f7a4d686d378678568841c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -540,18 +675,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf71cb39ec3c23f977652e411bfbdd7f485a011f8b4f557fa14ebc86436e758ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x697ab6995920f38b463d997a2051be02b0e80cf772a3206ceb59f5feaa640d03",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xec6adb5912c5d641e56d4a3ec1e1cf687760c17505abc9890260e0bff132785b",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824507a00e",
+                "balance" : "0x45639182458c9680",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -562,11 +690,10 @@
                 "code" : "0x600160005401600055600060006000600073b0000000000000000000000000000000000000005af4",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0xd2"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4916ff2",
+                "balance" : "0xe8d40c7980",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/NashatyrevSuicideRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/NashatyrevSuicideRevert_d0g0v0.json
index a9e202962..06f18dbe6 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/NashatyrevSuicideRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/NashatyrevSuicideRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "NashatyrevSuicideRevert_d0g0v0_EIP150" : {
+    "NashatyrevSuicideRevert_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/stRevertTest/NashatyrevSuicideRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x07421a",
-                    "hash" : "0x672e3e2fbb71104aafeac591da0b86d383e131c1b9313fa49931db69c0b4a5b0",
-                    "mixHash" : "0x8147f1b85d52bab12b40b714462531f8034cb4ae10f5ce1613edd84c79396d5c",
-                    "nonce" : "0x0c9c8255122fa453",
+                    "hash" : "0x65a9d65ccb95d41bd047e3e331c39adad195d67398d97dfb6dc92db1a294e30b",
+                    "mixHash" : "0x7e62bb2f41a6e67d5b80f145daead9227de70cb8f528661fb9e79e47a3a0fb1e",
+                    "nonce" : "0xe58c7dfebdda6bfa",
                     "number" : "0x01",
                     "parentHash" : "0x40c832031aa91117e599a68987da166970bfd4e62cd8ff4782994cf4cf8b7d7a",
-                    "receiptTrie" : "0x923bba4d35bcc5205c1dc9f1cd71cea4d4853f60877be4fa23cc4e46655fbb9c",
-                    "stateRoot" : "0x47e57e850f4d4ee077f2b94fee1d3a47561d2d47e5094f38e2dab2dabfefcdc4",
+                    "receiptTrie" : "0xe8c88d4124e0647b867e9fc6f2c0013902cb6a8b6e4f242f0cc79b14ed7bb2a0",
+                    "stateRoot" : "0x4aa583f8b951e065deb59aaefbce8e0d64f5c4ea9b2ae9e2cd83960571522b0c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd62da52a5179dcf241fb05828aa7e5aed84a279242b60ac140e613f36b9c3776",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a040c832031aa91117e599a68987da166970bfd4e62cd8ff4782994cf4cf8b7d7aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa047e57e850f4d4ee077f2b94fee1d3a47561d2d47e5094f38e2dab2dabfefcdc4a0d62da52a5179dcf241fb05828aa7e5aed84a279242b60ac140e613f36b9c3776a0923bba4d35bcc5205c1dc9f1cd71cea4d4853f60877be4fa23cc4e46655fbb9cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307421a8203e880a08147f1b85d52bab12b40b714462531f8034cb4ae10f5ce1613edd84c79396d5c880c9c8255122fa453f866f86480018307a12094a0000000000000000000000000000000000000008084c04062261ca023078a8e381f497bacc2258e1d05d7698ae6d314e6c847df45fb3b83b0e88abfa03d5c4e23c45b361abb30924aaced4adb925ea78e2e43fe603bf504542cd4fe1ec0",
+                "rlp" : "0xf90264f901f8a040c832031aa91117e599a68987da166970bfd4e62cd8ff4782994cf4cf8b7d7aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04aa583f8b951e065deb59aaefbce8e0d64f5c4ea9b2ae9e2cd83960571522b0ca0d62da52a5179dcf241fb05828aa7e5aed84a279242b60ac140e613f36b9c3776a0e8c88d4124e0647b867e9fc6f2c0013902cb6a8b6e4f242f0cc79b14ed7bb2a0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307421a8203e880a07e62bb2f41a6e67d5b80f145daead9227de70cb8f528661fb9e79e47a3a0fb1e88e58c7dfebdda6bfaf866f86480018307a12094a0000000000000000000000000000000000000008084c04062261ca023078a8e381f497bacc2258e1d05d7698ae6d314e6c847df45fb3b83b0e88abfa03d5c4e23c45b361abb30924aaced4adb925ea78e2e43fe603bf504542cd4fe1ec0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b66870780d686f0b01e0b69294835d80d5f0d7cbfa7c66e0275dcb14a6e876eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x672e3e2fbb71104aafeac591da0b86d383e131c1b9313fa49931db69c0b4a5b0",
-        "network" : "EIP150",
+        "lastblockhash" : "0x65a9d65ccb95d41bd047e3e331c39adad195d67398d97dfb6dc92db1a294e30b",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fb421a",
                 "code" : "",
@@ -104,10 +111,122 @@
             }
         }
     },
-    "NashatyrevSuicideRevert_d0g0v0_EIP158" : {
+    "NashatyrevSuicideRevert_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/NashatyrevSuicideRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x07421a",
+                    "hash" : "0x8f95273b3d422b1b251cd32549f1ff22efbb27f564325d71e2ce778d504502e3",
+                    "mixHash" : "0x49cc9796a53a39d22b3e1fef1ace6b2ac8a09649b0f0e1510c0268c064f6eb9b",
+                    "nonce" : "0x2c32e4b8e594c26a",
+                    "number" : "0x01",
+                    "parentHash" : "0x40c832031aa91117e599a68987da166970bfd4e62cd8ff4782994cf4cf8b7d7a",
+                    "receiptTrie" : "0xe8c88d4124e0647b867e9fc6f2c0013902cb6a8b6e4f242f0cc79b14ed7bb2a0",
+                    "stateRoot" : "0x4aa583f8b951e065deb59aaefbce8e0d64f5c4ea9b2ae9e2cd83960571522b0c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd62da52a5179dcf241fb05828aa7e5aed84a279242b60ac140e613f36b9c3776",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901f8a040c832031aa91117e599a68987da166970bfd4e62cd8ff4782994cf4cf8b7d7aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04aa583f8b951e065deb59aaefbce8e0d64f5c4ea9b2ae9e2cd83960571522b0ca0d62da52a5179dcf241fb05828aa7e5aed84a279242b60ac140e613f36b9c3776a0e8c88d4124e0647b867e9fc6f2c0013902cb6a8b6e4f242f0cc79b14ed7bb2a0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307421a8203e880a049cc9796a53a39d22b3e1fef1ace6b2ac8a09649b0f0e1510c0268c064f6eb9b882c32e4b8e594c26af866f86480018307a12094a0000000000000000000000000000000000000008084c04062261ca023078a8e381f497bacc2258e1d05d7698ae6d314e6c847df45fb3b83b0e88abfa03d5c4e23c45b361abb30924aaced4adb925ea78e2e43fe603bf504542cd4fe1ec0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x23078a8e381f497bacc2258e1d05d7698ae6d314e6c847df45fb3b83b0e88abf",
+                        "s" : "0x3d5c4e23c45b361abb30924aaced4adb925ea78e2e43fe603bf504542cd4fe1e",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x40c832031aa91117e599a68987da166970bfd4e62cd8ff4782994cf4cf8b7d7a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb66870780d686f0b01e0b69294835d80d5f0d7cbfa7c66e0275dcb14a6e876ed",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b66870780d686f0b01e0b69294835d80d5f0d7cbfa7c66e0275dcb14a6e876eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8f95273b3d422b1b251cd32549f1ff22efbb27f564325d71e2ce778d504502e3",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244fb421a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680639c3674fc14610049578063c040622614610058575b610000565b3461000057610056610067565b005b3461000057610065610147565b005b600060405160a680610200833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff1660405180807f6628290000000000000000000000000000000000000000000000000000000000815250600301905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f19250505050610000565b50565b3073ffffffffffffffffffffffffffffffffffffffff1660405180807f6261642829000000000000000000000000000000000000000000000000000000815250600501905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b56006060604052346000575b608f806100176000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806326121ff014603c575b6000565b3460005760466048565b005b3373ffffffffffffffffffffffffffffffffffffffff16ff5b5600a165627a7a723058203d1a897befde21eff26abc325fb3da2f526bbc99de1c5c857d1835f673744ebd0029a165627a7a72305820850a52b31ec4745b7af15ba3bffdb1ba17f5d9a00a5f263ee287a92b568f534c0029",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d49dcde6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680639c3674fc14610049578063c040622614610058575b610000565b3461000057610056610067565b005b3461000057610065610147565b005b600060405160a680610200833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff1660405180807f6628290000000000000000000000000000000000000000000000000000000000815250600301905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f19250505050610000565b50565b3073ffffffffffffffffffffffffffffffffffffffff1660405180807f6261642829000000000000000000000000000000000000000000000000000000815250600501905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b56006060604052346000575b608f806100176000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806326121ff014603c575b6000565b3460005760466048565b005b3373ffffffffffffffffffffffffffffffffffffffff16ff5b5600a165627a7a723058203d1a897befde21eff26abc325fb3da2f526bbc99de1c5c857d1835f673744ebd0029a165627a7a72305820850a52b31ec4745b7af15ba3bffdb1ba17f5d9a00a5f263ee287a92b568f534c0029",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NashatyrevSuicideRevert_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/stRevertTest/NashatyrevSuicideRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x07421a",
-                    "hash" : "0x118137cb3cd6b1170d8b90cfc315f9fdb021c0b4ec5cb7f5514b1b5393be64f0",
-                    "mixHash" : "0xef55c48aa06a25e06c879608476f7960ff9e3d99a93c4b148529c8b2965b592c",
-                    "nonce" : "0xbf7e6b7f7b723332",
+                    "hash" : "0xb8f6e8072c04762bcf02cbb3b042113a1d4a6098b48880ef1ea8728a96947239",
+                    "mixHash" : "0x37b19f9721d59967949344a70702728aa2d62ba4e5f763ebf519ede129206fcd",
+                    "nonce" : "0xac55009848eb0f37",
                     "number" : "0x01",
                     "parentHash" : "0x40c832031aa91117e599a68987da166970bfd4e62cd8ff4782994cf4cf8b7d7a",
                     "receiptTrie" : "0x923bba4d35bcc5205c1dc9f1cd71cea4d4853f60877be4fa23cc4e46655fbb9c",
@@ -130,7 +249,7 @@
                     "transactionsTrie" : "0xd62da52a5179dcf241fb05828aa7e5aed84a279242b60ac140e613f36b9c3776",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a040c832031aa91117e599a68987da166970bfd4e62cd8ff4782994cf4cf8b7d7aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa047e57e850f4d4ee077f2b94fee1d3a47561d2d47e5094f38e2dab2dabfefcdc4a0d62da52a5179dcf241fb05828aa7e5aed84a279242b60ac140e613f36b9c3776a0923bba4d35bcc5205c1dc9f1cd71cea4d4853f60877be4fa23cc4e46655fbb9cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307421a8203e880a0ef55c48aa06a25e06c879608476f7960ff9e3d99a93c4b148529c8b2965b592c88bf7e6b7f7b723332f866f86480018307a12094a0000000000000000000000000000000000000008084c04062261ca023078a8e381f497bacc2258e1d05d7698ae6d314e6c847df45fb3b83b0e88abfa03d5c4e23c45b361abb30924aaced4adb925ea78e2e43fe603bf504542cd4fe1ec0",
+                "rlp" : "0xf90264f901f8a040c832031aa91117e599a68987da166970bfd4e62cd8ff4782994cf4cf8b7d7aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa047e57e850f4d4ee077f2b94fee1d3a47561d2d47e5094f38e2dab2dabfefcdc4a0d62da52a5179dcf241fb05828aa7e5aed84a279242b60ac140e613f36b9c3776a0923bba4d35bcc5205c1dc9f1cd71cea4d4853f60877be4fa23cc4e46655fbb9cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307421a8203e880a037b19f9721d59967949344a70702728aa2d62ba4e5f763ebf519ede129206fcd88ac55009848eb0f37f866f86480018307a12094a0000000000000000000000000000000000000008084c04062261ca023078a8e381f497bacc2258e1d05d7698ae6d314e6c847df45fb3b83b0e88abfa03d5c4e23c45b361abb30924aaced4adb925ea78e2e43fe603bf504542cd4fe1ec0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -167,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b66870780d686f0b01e0b69294835d80d5f0d7cbfa7c66e0275dcb14a6e876eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x118137cb3cd6b1170d8b90cfc315f9fdb021c0b4ec5cb7f5514b1b5393be64f0",
-        "network" : "EIP158",
+        "lastblockhash" : "0xb8f6e8072c04762bcf02cbb3b042113a1d4a6098b48880ef1ea8728a96947239",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fb421a",
@@ -209,10 +328,10 @@
             }
         }
     },
-    "NashatyrevSuicideRevert_d0g0v0_Frontier" : {
+    "NashatyrevSuicideRevert_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/stRevertTest/NashatyrevSuicideRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -223,19 +342,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x073f86",
-                    "hash" : "0x02f627f4830171570962f4879ffaf726d7e3bb07466061771973d3c3e15ac2ab",
-                    "mixHash" : "0x25a39fcca9232f22f8d36d862c76d3abba6352b41b6bef9fd0ebc5e42118834e",
-                    "nonce" : "0x5b610f3e0a00dca0",
+                    "gasUsed" : "0x07421a",
+                    "hash" : "0x342942c12c5f0abe4f47c0f5d8dbec58ba9c1f7362ec391c68f14b2c9643af75",
+                    "mixHash" : "0xf2f7ba5a7574bd4da37125790b53e39fe42eb575fc9657e3b7ea450bdf5ed734",
+                    "nonce" : "0x9ec5789957570c3c",
                     "number" : "0x01",
                     "parentHash" : "0x40c832031aa91117e599a68987da166970bfd4e62cd8ff4782994cf4cf8b7d7a",
-                    "receiptTrie" : "0x4294e4d566345b75803c9089f70689564f63aaf369b1eb6ededdd661b9affb73",
-                    "stateRoot" : "0xfe5b343144319c2a34860c5494140b1e2caa23f788f3d4f41784fe8cabff0ee1",
+                    "receiptTrie" : "0x923bba4d35bcc5205c1dc9f1cd71cea4d4853f60877be4fa23cc4e46655fbb9c",
+                    "stateRoot" : "0x47e57e850f4d4ee077f2b94fee1d3a47561d2d47e5094f38e2dab2dabfefcdc4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd62da52a5179dcf241fb05828aa7e5aed84a279242b60ac140e613f36b9c3776",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a040c832031aa91117e599a68987da166970bfd4e62cd8ff4782994cf4cf8b7d7aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe5b343144319c2a34860c5494140b1e2caa23f788f3d4f41784fe8cabff0ee1a0d62da52a5179dcf241fb05828aa7e5aed84a279242b60ac140e613f36b9c3776a04294e4d566345b75803c9089f70689564f63aaf369b1eb6ededdd661b9affb73b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083073f868203e880a025a39fcca9232f22f8d36d862c76d3abba6352b41b6bef9fd0ebc5e42118834e885b610f3e0a00dca0f866f86480018307a12094a0000000000000000000000000000000000000008084c04062261ca023078a8e381f497bacc2258e1d05d7698ae6d314e6c847df45fb3b83b0e88abfa03d5c4e23c45b361abb30924aaced4adb925ea78e2e43fe603bf504542cd4fe1ec0",
+                "rlp" : "0xf90264f901f8a040c832031aa91117e599a68987da166970bfd4e62cd8ff4782994cf4cf8b7d7aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa047e57e850f4d4ee077f2b94fee1d3a47561d2d47e5094f38e2dab2dabfefcdc4a0d62da52a5179dcf241fb05828aa7e5aed84a279242b60ac140e613f36b9c3776a0923bba4d35bcc5205c1dc9f1cd71cea4d4853f60877be4fa23cc4e46655fbb9cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307421a8203e880a0f2f7ba5a7574bd4da37125790b53e39fe42eb575fc9657e3b7ea450bdf5ed734889ec5789957570c3cf866f86480018307a12094a0000000000000000000000000000000000000008084c04062261ca023078a8e381f497bacc2258e1d05d7698ae6d314e6c847df45fb3b83b0e88abfa03d5c4e23c45b361abb30924aaced4adb925ea78e2e43fe603bf504542cd4fe1ec0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -272,11 +391,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b66870780d686f0b01e0b69294835d80d5f0d7cbfa7c66e0275dcb14a6e876eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x02f627f4830171570962f4879ffaf726d7e3bb07466061771973d3c3e15ac2ab",
-        "network" : "Frontier",
+        "lastblockhash" : "0x342942c12c5f0abe4f47c0f5d8dbec58ba9c1f7362ec391c68f14b2c9643af75",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fb3f86",
+                "balance" : "0x4563918244fb421a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -290,7 +409,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d49dd07a",
+                "balance" : "0xe8d49dcde6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -314,10 +433,10 @@
             }
         }
     },
-    "NashatyrevSuicideRevert_d0g0v0_Homestead" : {
+    "NashatyrevSuicideRevert_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/stRevertTest/NashatyrevSuicideRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +448,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x073f86",
-                    "hash" : "0xf0c0173db11367fca3ff6d57174d197efada3979c704080bb73822280a4b46da",
-                    "mixHash" : "0xe8a3e24de67891e579b7f1e2a38e652481104d5aeb9ae8280b225ade4b0a31ea",
-                    "nonce" : "0xd3309e225847fdf4",
+                    "hash" : "0xea0c2887908259347199db42efabd5eb14df4d7db1dcabd27006ee9e2a5a4308",
+                    "mixHash" : "0x9be8219c84a073e07c5c99296d150e0de10dba8db9f8f6f496a266f06d783cf3",
+                    "nonce" : "0x5ce60356ae3087a9",
                     "number" : "0x01",
                     "parentHash" : "0x40c832031aa91117e599a68987da166970bfd4e62cd8ff4782994cf4cf8b7d7a",
                     "receiptTrie" : "0x4294e4d566345b75803c9089f70689564f63aaf369b1eb6ededdd661b9affb73",
@@ -340,7 +459,7 @@
                     "transactionsTrie" : "0xd62da52a5179dcf241fb05828aa7e5aed84a279242b60ac140e613f36b9c3776",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a040c832031aa91117e599a68987da166970bfd4e62cd8ff4782994cf4cf8b7d7aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe5b343144319c2a34860c5494140b1e2caa23f788f3d4f41784fe8cabff0ee1a0d62da52a5179dcf241fb05828aa7e5aed84a279242b60ac140e613f36b9c3776a04294e4d566345b75803c9089f70689564f63aaf369b1eb6ededdd661b9affb73b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083073f868203e880a0e8a3e24de67891e579b7f1e2a38e652481104d5aeb9ae8280b225ade4b0a31ea88d3309e225847fdf4f866f86480018307a12094a0000000000000000000000000000000000000008084c04062261ca023078a8e381f497bacc2258e1d05d7698ae6d314e6c847df45fb3b83b0e88abfa03d5c4e23c45b361abb30924aaced4adb925ea78e2e43fe603bf504542cd4fe1ec0",
+                "rlp" : "0xf90264f901f8a040c832031aa91117e599a68987da166970bfd4e62cd8ff4782994cf4cf8b7d7aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe5b343144319c2a34860c5494140b1e2caa23f788f3d4f41784fe8cabff0ee1a0d62da52a5179dcf241fb05828aa7e5aed84a279242b60ac140e613f36b9c3776a04294e4d566345b75803c9089f70689564f63aaf369b1eb6ededdd661b9affb73b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083073f868203e880a09be8219c84a073e07c5c99296d150e0de10dba8db9f8f6f496a266f06d783cf3885ce60356ae3087a9f866f86480018307a12094a0000000000000000000000000000000000000008084c04062261ca023078a8e381f497bacc2258e1d05d7698ae6d314e6c847df45fb3b83b0e88abfa03d5c4e23c45b361abb30924aaced4adb925ea78e2e43fe603bf504542cd4fe1ec0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -377,8 +496,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b66870780d686f0b01e0b69294835d80d5f0d7cbfa7c66e0275dcb14a6e876eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf0c0173db11367fca3ff6d57174d197efada3979c704080bb73822280a4b46da",
-        "network" : "Homestead",
+        "lastblockhash" : "0xea0c2887908259347199db42efabd5eb14df4d7db1dcabd27006ee9e2a5a4308",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fb3f86",
@@ -419,10 +538,10 @@
             }
         }
     },
-    "NashatyrevSuicideRevert_d0g0v0_Metropolis" : {
+    "NashatyrevSuicideRevert_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/NashatyrevSuicideRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -433,19 +552,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x07421a",
-                    "hash" : "0xde213fda8aef3d41d4dc23cb3ff9d6bdaa9418a5af7faffcfd0e7cfb3a08bb0b",
-                    "mixHash" : "0x2f25ffea82e4929d77cef5030d73defa79a64114df2cb04a65276d7b9c0850df",
-                    "nonce" : "0xec5a916c051f4208",
+                    "gasUsed" : "0x073f86",
+                    "hash" : "0x2699c72a0c97762a5e4b4380b9273898253dd0d84b056bf02a15c2304e60b8b0",
+                    "mixHash" : "0x3ed581f77dcf7fdd7991939f86665c4684fcb07dd33f519ede54a97e3fd0a379",
+                    "nonce" : "0x9192309723954599",
                     "number" : "0x01",
                     "parentHash" : "0x40c832031aa91117e599a68987da166970bfd4e62cd8ff4782994cf4cf8b7d7a",
-                    "receiptTrie" : "0xe8c88d4124e0647b867e9fc6f2c0013902cb6a8b6e4f242f0cc79b14ed7bb2a0",
-                    "stateRoot" : "0x4aa583f8b951e065deb59aaefbce8e0d64f5c4ea9b2ae9e2cd83960571522b0c",
+                    "receiptTrie" : "0x4294e4d566345b75803c9089f70689564f63aaf369b1eb6ededdd661b9affb73",
+                    "stateRoot" : "0xfe5b343144319c2a34860c5494140b1e2caa23f788f3d4f41784fe8cabff0ee1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd62da52a5179dcf241fb05828aa7e5aed84a279242b60ac140e613f36b9c3776",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a040c832031aa91117e599a68987da166970bfd4e62cd8ff4782994cf4cf8b7d7aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04aa583f8b951e065deb59aaefbce8e0d64f5c4ea9b2ae9e2cd83960571522b0ca0d62da52a5179dcf241fb05828aa7e5aed84a279242b60ac140e613f36b9c3776a0e8c88d4124e0647b867e9fc6f2c0013902cb6a8b6e4f242f0cc79b14ed7bb2a0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808307421a8203e880a02f25ffea82e4929d77cef5030d73defa79a64114df2cb04a65276d7b9c0850df88ec5a916c051f4208f866f86480018307a12094a0000000000000000000000000000000000000008084c04062261ca023078a8e381f497bacc2258e1d05d7698ae6d314e6c847df45fb3b83b0e88abfa03d5c4e23c45b361abb30924aaced4adb925ea78e2e43fe603bf504542cd4fe1ec0",
+                "rlp" : "0xf90264f901f8a040c832031aa91117e599a68987da166970bfd4e62cd8ff4782994cf4cf8b7d7aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fe5b343144319c2a34860c5494140b1e2caa23f788f3d4f41784fe8cabff0ee1a0d62da52a5179dcf241fb05828aa7e5aed84a279242b60ac140e613f36b9c3776a04294e4d566345b75803c9089f70689564f63aaf369b1eb6ededdd661b9affb73b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083073f868203e880a03ed581f77dcf7fdd7991939f86665c4684fcb07dd33f519ede54a97e3fd0a379889192309723954599f866f86480018307a12094a0000000000000000000000000000000000000008084c04062261ca023078a8e381f497bacc2258e1d05d7698ae6d314e6c847df45fb3b83b0e88abfa03d5c4e23c45b361abb30924aaced4adb925ea78e2e43fe603bf504542cd4fe1ec0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -482,18 +601,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b66870780d686f0b01e0b69294835d80d5f0d7cbfa7c66e0275dcb14a6e876eda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xde213fda8aef3d41d4dc23cb3ff9d6bdaa9418a5af7faffcfd0e7cfb3a08bb0b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x2699c72a0c97762a5e4b4380b9273898253dd0d84b056bf02a15c2304e60b8b0",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fb421a",
+                "balance" : "0x4563918244fb3f86",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,7 +619,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d49dcde6",
+                "balance" : "0xe8d49dd07a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepth2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepth2_d0g0v0.json
index 55a02a6fa..6197ee794 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepth2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepth2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertDepth2_d0g0v0_EIP150" : {
+    "RevertDepth2_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/stRevertTest/RevertDepth2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x029abd",
-                    "hash" : "0x46d5385b4d51242da488ad04cb80f1e39973377b0015783eea341cc49c07fbbd",
-                    "mixHash" : "0xe74a7f8d1177a28fe06ac9c687efa5e727b30901dac56ed0b208e3533c50c5b2",
-                    "nonce" : "0x944ea51ce89cf73d",
+                    "hash" : "0x616e6ca645cb9a54806c05ef5b9f7afb07cc7278fdde6e8595c2331ed773ac8a",
+                    "mixHash" : "0x198ea582d00b4b3180ebf828cae29477f6ac3096bd9a93bb26d9758bf91f0008",
+                    "nonce" : "0xde125fc44fea3ab7",
                     "number" : "0x01",
                     "parentHash" : "0xe781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7",
-                    "receiptTrie" : "0x68b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602e",
-                    "stateRoot" : "0xa73e03ccd49969c7132d7a0d8a80fdcf8735f38f4778d63afcd98e137126919f",
+                    "receiptTrie" : "0x3c6f093a7893cba8ad3260a6fc4bd0354037088208bb0a8e241f113127384995",
+                    "stateRoot" : "0x79afee77818842c3174e947006388f373f48787f5b5c05a72d78d994808a738b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a73e03ccd49969c7132d7a0d8a80fdcf8735f38f4778d63afcd98e137126919fa0f3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08aa068b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029abd8203e880a0e74a7f8d1177a28fe06ac9c687efa5e727b30901dac56ed0b208e3533c50c5b288944ea51ce89cf73df862f860800183029abd94a00000000000000000000000000000000000000080801ba03937bea6a1633387223215ebe1f86e63a7b4b2b1f3e7b1ad88343465eb03a66ea055fe9b0de469d8575c2b9fc9c2e71d395a9bab580f17f00f657d1a696e3f5345c0",
+                "rlp" : "0xf90260f901f8a0e781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa079afee77818842c3174e947006388f373f48787f5b5c05a72d78d994808a738ba0f3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08aa03c6f093a7893cba8ad3260a6fc4bd0354037088208bb0a8e241f113127384995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029abd8203e880a0198ea582d00b4b3180ebf828cae29477f6ac3096bd9a93bb26d9758bf91f000888de125fc44fea3ab7f862f860800183029abd94a00000000000000000000000000000000000000080801ba03937bea6a1633387223215ebe1f86e63a7b4b2b1f3e7b1ad88343465eb03a66ea055fe9b0de469d8575c2b9fc9c2e71d395a9bab580f17f00f657d1a696e3f5345c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2b10c889bc42e1e714a22bad4b9e5bf92723f8c420b8aa9937b0e612c0c6b5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x46d5385b4d51242da488ad04cb80f1e39973377b0015783eea341cc49c07fbbd",
-        "network" : "EIP150",
+        "lastblockhash" : "0x616e6ca645cb9a54806c05ef5b9f7afb07cc7278fdde6e8595c2331ed773ac8a",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f69abd",
                 "code" : "",
@@ -146,10 +153,10 @@
             }
         }
     },
-    "RevertDepth2_d0g0v0_EIP158" : {
+    "RevertDepth2_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/stRevertTest/RevertDepth2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -161,18 +168,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x029abd",
-                    "hash" : "0xe0e24ec21b314e60f22f7df42798e7ceded5d5ac926706eeed17ce92cf0fc513",
-                    "mixHash" : "0x8e22af5118bbef9b67174c8644922f7e80c67f39e4b945ec32651f3a856bae98",
-                    "nonce" : "0x544e23ede1a0adbf",
+                    "hash" : "0xaefe4b2f6eb0e6aa0d67fcd5dbb85e9d3836c29789e66a56d1ae9a4a804ed94d",
+                    "mixHash" : "0x1dc211ce59af3b5398cb6103980dd4056b36d337579b56f22564cdcd1d22aea3",
+                    "nonce" : "0x9033e857623b5284",
                     "number" : "0x01",
                     "parentHash" : "0xe781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7",
-                    "receiptTrie" : "0x68b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602e",
-                    "stateRoot" : "0xa73e03ccd49969c7132d7a0d8a80fdcf8735f38f4778d63afcd98e137126919f",
+                    "receiptTrie" : "0x3c6f093a7893cba8ad3260a6fc4bd0354037088208bb0a8e241f113127384995",
+                    "stateRoot" : "0x79afee77818842c3174e947006388f373f48787f5b5c05a72d78d994808a738b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a73e03ccd49969c7132d7a0d8a80fdcf8735f38f4778d63afcd98e137126919fa0f3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08aa068b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029abd8203e880a08e22af5118bbef9b67174c8644922f7e80c67f39e4b945ec32651f3a856bae9888544e23ede1a0adbff862f860800183029abd94a00000000000000000000000000000000000000080801ba03937bea6a1633387223215ebe1f86e63a7b4b2b1f3e7b1ad88343465eb03a66ea055fe9b0de469d8575c2b9fc9c2e71d395a9bab580f17f00f657d1a696e3f5345c0",
+                "rlp" : "0xf90260f901f8a0e781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa079afee77818842c3174e947006388f373f48787f5b5c05a72d78d994808a738ba0f3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08aa03c6f093a7893cba8ad3260a6fc4bd0354037088208bb0a8e241f113127384995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029abd8203e880a01dc211ce59af3b5398cb6103980dd4056b36d337579b56f22564cdcd1d22aea3889033e857623b5284f862f860800183029abd94a00000000000000000000000000000000000000080801ba03937bea6a1633387223215ebe1f86e63a7b4b2b1f3e7b1ad88343465eb03a66ea055fe9b0de469d8575c2b9fc9c2e71d395a9bab580f17f00f657d1a696e3f5345c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -209,9 +216,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2b10c889bc42e1e714a22bad4b9e5bf92723f8c420b8aa9937b0e612c0c6b5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe0e24ec21b314e60f22f7df42798e7ceded5d5ac926706eeed17ce92cf0fc513",
-        "network" : "EIP158",
+        "lastblockhash" : "0xaefe4b2f6eb0e6aa0d67fcd5dbb85e9d3836c29789e66a56d1ae9a4a804ed94d",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f69abd",
                 "code" : "",
@@ -293,10 +307,10 @@
             }
         }
     },
-    "RevertDepth2_d0g0v0_Frontier" : {
+    "RevertDepth2_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/stRevertTest/RevertDepth2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -308,9 +322,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x029abd",
-                    "hash" : "0x0acd165bbc88b06db52fda4e74af4d81a6d21951c0684255c4f222bca9389f88",
-                    "mixHash" : "0x248eca4eb7aabd3edf5429871c7463d0d6d30d402465b45b70aeee8277bf64b1",
-                    "nonce" : "0xdb183e8c0cd7e7b9",
+                    "hash" : "0xeed0c7fe43fccf3a6f730ed05fb504356088dea58557ee9df3e666942b5c6145",
+                    "mixHash" : "0x9d3d066791b68266b13d55c4b6e05b6627038e1c6cfd3bd9a79d4440f7fa7b19",
+                    "nonce" : "0x91c87682725c1e30",
                     "number" : "0x01",
                     "parentHash" : "0xe781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7",
                     "receiptTrie" : "0x68b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602e",
@@ -319,7 +333,7 @@
                     "transactionsTrie" : "0xf3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a73e03ccd49969c7132d7a0d8a80fdcf8735f38f4778d63afcd98e137126919fa0f3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08aa068b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029abd8203e880a0248eca4eb7aabd3edf5429871c7463d0d6d30d402465b45b70aeee8277bf64b188db183e8c0cd7e7b9f862f860800183029abd94a00000000000000000000000000000000000000080801ba03937bea6a1633387223215ebe1f86e63a7b4b2b1f3e7b1ad88343465eb03a66ea055fe9b0de469d8575c2b9fc9c2e71d395a9bab580f17f00f657d1a696e3f5345c0",
+                "rlp" : "0xf90260f901f8a0e781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a73e03ccd49969c7132d7a0d8a80fdcf8735f38f4778d63afcd98e137126919fa0f3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08aa068b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029abd8203e880a09d3d066791b68266b13d55c4b6e05b6627038e1c6cfd3bd9a79d4440f7fa7b198891c87682725c1e30f862f860800183029abd94a00000000000000000000000000000000000000080801ba03937bea6a1633387223215ebe1f86e63a7b4b2b1f3e7b1ad88343465eb03a66ea055fe9b0de469d8575c2b9fc9c2e71d395a9bab580f17f00f657d1a696e3f5345c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -356,8 +370,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2b10c889bc42e1e714a22bad4b9e5bf92723f8c420b8aa9937b0e612c0c6b5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0acd165bbc88b06db52fda4e74af4d81a6d21951c0684255c4f222bca9389f88",
-        "network" : "Frontier",
+        "lastblockhash" : "0xeed0c7fe43fccf3a6f730ed05fb504356088dea58557ee9df3e666942b5c6145",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f69abd",
@@ -440,10 +454,10 @@
             }
         }
     },
-    "RevertDepth2_d0g0v0_Homestead" : {
+    "RevertDepth2_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/stRevertTest/RevertDepth2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -455,9 +469,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x029abd",
-                    "hash" : "0x7aadbf4abbac5e282e22e0aa69fed8a6cde2acd1775cd6830874809d4fb07ac3",
-                    "mixHash" : "0x1cda078fcda658ea631ea062975f4b273cb00c6466cfbdb11eb1f5aa7e3f2f24",
-                    "nonce" : "0xc3b159b3a65becbe",
+                    "hash" : "0x51011145cbaa734ff98f0cd9339b51e2534acf6c08941fca96a2312ac211a2ff",
+                    "mixHash" : "0xcc44ed071954a833b11006cf7e6c7adede569b55f644416b463d1af7f0bf1896",
+                    "nonce" : "0x610cb0023517e2da",
                     "number" : "0x01",
                     "parentHash" : "0xe781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7",
                     "receiptTrie" : "0x68b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602e",
@@ -466,7 +480,7 @@
                     "transactionsTrie" : "0xf3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a73e03ccd49969c7132d7a0d8a80fdcf8735f38f4778d63afcd98e137126919fa0f3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08aa068b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029abd8203e880a01cda078fcda658ea631ea062975f4b273cb00c6466cfbdb11eb1f5aa7e3f2f2488c3b159b3a65becbef862f860800183029abd94a00000000000000000000000000000000000000080801ba03937bea6a1633387223215ebe1f86e63a7b4b2b1f3e7b1ad88343465eb03a66ea055fe9b0de469d8575c2b9fc9c2e71d395a9bab580f17f00f657d1a696e3f5345c0",
+                "rlp" : "0xf90260f901f8a0e781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a73e03ccd49969c7132d7a0d8a80fdcf8735f38f4778d63afcd98e137126919fa0f3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08aa068b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029abd8203e880a0cc44ed071954a833b11006cf7e6c7adede569b55f644416b463d1af7f0bf189688610cb0023517e2daf862f860800183029abd94a00000000000000000000000000000000000000080801ba03937bea6a1633387223215ebe1f86e63a7b4b2b1f3e7b1ad88343465eb03a66ea055fe9b0de469d8575c2b9fc9c2e71d395a9bab580f17f00f657d1a696e3f5345c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -503,8 +517,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2b10c889bc42e1e714a22bad4b9e5bf92723f8c420b8aa9937b0e612c0c6b5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7aadbf4abbac5e282e22e0aa69fed8a6cde2acd1775cd6830874809d4fb07ac3",
-        "network" : "Homestead",
+        "lastblockhash" : "0x51011145cbaa734ff98f0cd9339b51e2534acf6c08941fca96a2312ac211a2ff",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f69abd",
@@ -587,10 +601,10 @@
             }
         }
     },
-    "RevertDepth2_d0g0v0_Metropolis" : {
+    "RevertDepth2_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/stRevertTest/RevertDepth2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -602,18 +616,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x029abd",
-                    "hash" : "0x09440d5a3e0c3cb7e0206672123d142ac4a34b0f2190df6490c8b006f82d28b0",
-                    "mixHash" : "0x0ed559c6dd18df5ae2966150bd01767772f6655e57b64d80289bc2f7c490e4eb",
-                    "nonce" : "0xaff79542f1de77f7",
+                    "hash" : "0x1b4718d9d16f2d78e6acfa6dbc1d40840dbd99b6283cdb79b10cbbb86a620dad",
+                    "mixHash" : "0x9085597df893e40ecd14f3164cc7cefccf087b4b01da80823952ebb9c3d632f1",
+                    "nonce" : "0x0984ef0e2fe415cb",
                     "number" : "0x01",
                     "parentHash" : "0xe781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7",
-                    "receiptTrie" : "0x3c6f093a7893cba8ad3260a6fc4bd0354037088208bb0a8e241f113127384995",
-                    "stateRoot" : "0x79afee77818842c3174e947006388f373f48787f5b5c05a72d78d994808a738b",
+                    "receiptTrie" : "0x68b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602e",
+                    "stateRoot" : "0xa73e03ccd49969c7132d7a0d8a80fdcf8735f38f4778d63afcd98e137126919f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa079afee77818842c3174e947006388f373f48787f5b5c05a72d78d994808a738ba0f3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08aa03c6f093a7893cba8ad3260a6fc4bd0354037088208bb0a8e241f113127384995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029abd8203e880a00ed559c6dd18df5ae2966150bd01767772f6655e57b64d80289bc2f7c490e4eb88aff79542f1de77f7f862f860800183029abd94a00000000000000000000000000000000000000080801ba03937bea6a1633387223215ebe1f86e63a7b4b2b1f3e7b1ad88343465eb03a66ea055fe9b0de469d8575c2b9fc9c2e71d395a9bab580f17f00f657d1a696e3f5345c0",
+                "rlp" : "0xf90260f901f8a0e781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a73e03ccd49969c7132d7a0d8a80fdcf8735f38f4778d63afcd98e137126919fa0f3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08aa068b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029abd8203e880a09085597df893e40ecd14f3164cc7cefccf087b4b01da80823952ebb9c3d632f1880984ef0e2fe415cbf862f860800183029abd94a00000000000000000000000000000000000000080801ba03937bea6a1633387223215ebe1f86e63a7b4b2b1f3e7b1ad88343465eb03a66ea055fe9b0de469d8575c2b9fc9c2e71d395a9bab580f17f00f657d1a696e3f5345c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -650,16 +664,156 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2b10c889bc42e1e714a22bad4b9e5bf92723f8c420b8aa9937b0e612c0c6b5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x09440d5a3e0c3cb7e0206672123d142ac4a34b0f2190df6490c8b006f82d28b0",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x1b4718d9d16f2d78e6acfa6dbc1d40840dbd99b6283cdb79b10cbbb86a620dad",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f69abd",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000546001016000556000600060006000600073b000000000000000000000000000000000000000620249f0f16001556000600060006000600073d000000000000000000000000000000000000000620249f0f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a27543",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000546001016000556000600060006000600073c00000000000000000000000000000000000000061c350f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600054600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x6000546001016000556000600060006000600073c00000000000000000000000000000000000000061c350f16001555a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000546001016000556000600060006000600073b000000000000000000000000000000000000000620249f0f16001556000600060006000600073d000000000000000000000000000000000000000620249f0f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000546001016000556000600060006000600073c00000000000000000000000000000000000000061c350f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600054600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000546001016000556000600060006000600073c00000000000000000000000000000000000000061c350f16001555a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertDepth2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepth2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x029abd",
+                    "hash" : "0xaa4b330daa89547a92ab01016ded4a59b215c7767b7f37904b404e8d5bc00267",
+                    "mixHash" : "0x4bc6952cbd3e664da5ebd623ffd8dd38bebab1acfa6d2a9146d915bb5ec11bb3",
+                    "nonce" : "0x98a37b437fd1e196",
+                    "number" : "0x01",
+                    "parentHash" : "0xe781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7",
+                    "receiptTrie" : "0x68b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602e",
+                    "stateRoot" : "0xa73e03ccd49969c7132d7a0d8a80fdcf8735f38f4778d63afcd98e137126919f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0e781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a73e03ccd49969c7132d7a0d8a80fdcf8735f38f4778d63afcd98e137126919fa0f3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08aa068b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029abd8203e880a04bc6952cbd3e664da5ebd623ffd8dd38bebab1acfa6d2a9146d915bb5ec11bb38898a37b437fd1e196f862f860800183029abd94a00000000000000000000000000000000000000080801ba03937bea6a1633387223215ebe1f86e63a7b4b2b1f3e7b1ad88343465eb03a66ea055fe9b0de469d8575c2b9fc9c2e71d395a9bab580f17f00f657d1a696e3f5345c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029abd",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3937bea6a1633387223215ebe1f86e63a7b4b2b1f3e7b1ad88343465eb03a66e",
+                        "s" : "0x55fe9b0de469d8575c2b9fc9c2e71d395a9bab580f17f00f657d1a696e3f5345",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xe781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc2b10c889bc42e1e714a22bad4b9e5bf92723f8c420b8aa9937b0e612c0c6b5f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2b10c889bc42e1e714a22bad4b9e5bf92723f8c420b8aa9937b0e612c0c6b5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xaa4b330daa89547a92ab01016ded4a59b215c7767b7f37904b404e8d5bc00267",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f69abd",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d0g0v0.json
index f0f5eb78f..a1ee5a481 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertDepthCreateAddressCollision_d0g0v0_EIP150" : {
+    "RevertDepthCreateAddressCollision_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/stRevertTest/RevertDepthCreateAddressCollision_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x7513023a06cfed79222a5d9b481c4c4f467ff0b0bd10648485f617961feafe17",
-                    "mixHash" : "0x4dfe344d5b0254200dcf5986e94a306f7e7af249f7ff817f4a06bdbe94cb9d91",
-                    "nonce" : "0xc601ddf3e05ac757",
+                    "hash" : "0xa2f5d79aad956e6bfafb3059a0717fc14f89e63bc70a69ac31a9385880bf0091",
+                    "mixHash" : "0x34b65c712715afae9d308e9c56282073d8bf73f5e7bf247a233c21540ca20a21",
+                    "nonce" : "0x2a844759f6f1c16e",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0xc179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fa",
-                    "stateRoot" : "0x4e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083e",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x5f014c1da847c7a2178e36135d6ff7cb2639d0eb6363e4e4e65a8d1c0dbc3bde",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x23c0d3758fafe8091129eb77acb4a8b0539a98f61ab9973403ef5ccdda568c54",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea023c0d3758fafe8091129eb77acb4a8b0539a98f61ab9973403ef5ccdda568c54a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a04dfe344d5b0254200dcf5986e94a306f7e7af249f7ff817f4a06bdbe94cb9d9188c601ddf3e05ac757f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601ca052440d702c31ca78d1e89a9f5f0ee6554bda5a781b175ae21edf7594bd6cc7e9a052e53542b83c552eecd9afc95cab350d90c4b1f9ce536353e68fb96c06b69df1c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05f014c1da847c7a2178e36135d6ff7cb2639d0eb6363e4e4e65a8d1c0dbc3bdea023c0d3758fafe8091129eb77acb4a8b0539a98f61ab9973403ef5ccdda568c54a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a034b65c712715afae9d308e9c56282073d8bf73f5e7bf247a233c21540ca20a21882a844759f6f1c16ef882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601ca052440d702c31ca78d1e89a9f5f0ee6554bda5a781b175ae21edf7594bd6cc7e9a052e53542b83c552eecd9afc95cab350d90c4b1f9ce536353e68fb96c06b69df1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7513023a06cfed79222a5d9b481c4c4f467ff0b0bd10648485f617961feafe17",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa2f5d79aad956e6bfafb3059a0717fc14f89e63bc70a69ac31a9385880bf0091",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
                 "code" : "",
@@ -118,10 +125,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d0g0v0_EIP158" : {
+    "RevertDepthCreateAddressCollision_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/stRevertTest/RevertDepthCreateAddressCollision_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -133,18 +140,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x46ba7d33e4c93a796c11c8e3961c1f6b23dcead296306532f678a13ea025d411",
-                    "mixHash" : "0xc8ddd644d5d6cb698a3537f78c03d170f8de5ec4aef8e78d9f0f01ce541427fd",
-                    "nonce" : "0x2f73da144aa106dd",
+                    "hash" : "0xa31d3ee3a13a92d2edb59161f0b043f8c67208159a3b4315dab2257d03ce772b",
+                    "mixHash" : "0x6dffac549630ea2c11642f2b2c337b96db6373e0fe8b2c29ba6d6f7580648bbb",
+                    "nonce" : "0xf55676fd3a028b00",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0xc179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fa",
-                    "stateRoot" : "0x4e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083e",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x5f014c1da847c7a2178e36135d6ff7cb2639d0eb6363e4e4e65a8d1c0dbc3bde",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x23c0d3758fafe8091129eb77acb4a8b0539a98f61ab9973403ef5ccdda568c54",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea023c0d3758fafe8091129eb77acb4a8b0539a98f61ab9973403ef5ccdda568c54a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0c8ddd644d5d6cb698a3537f78c03d170f8de5ec4aef8e78d9f0f01ce541427fd882f73da144aa106ddf882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601ca052440d702c31ca78d1e89a9f5f0ee6554bda5a781b175ae21edf7594bd6cc7e9a052e53542b83c552eecd9afc95cab350d90c4b1f9ce536353e68fb96c06b69df1c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05f014c1da847c7a2178e36135d6ff7cb2639d0eb6363e4e4e65a8d1c0dbc3bdea023c0d3758fafe8091129eb77acb4a8b0539a98f61ab9973403ef5ccdda568c54a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a06dffac549630ea2c11642f2b2c337b96db6373e0fe8b2c29ba6d6f7580648bbb88f55676fd3a028b00f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601ca052440d702c31ca78d1e89a9f5f0ee6554bda5a781b175ae21edf7594bd6cc7e9a052e53542b83c552eecd9afc95cab350d90c4b1f9ce536353e68fb96c06b69df1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -181,9 +188,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x46ba7d33e4c93a796c11c8e3961c1f6b23dcead296306532f678a13ea025d411",
-        "network" : "EIP158",
+        "lastblockhash" : "0xa31d3ee3a13a92d2edb59161f0b043f8c67208159a3b4315dab2257d03ce772b",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
                 "code" : "",
@@ -237,10 +251,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d0g0v0_Frontier" : {
+    "RevertDepthCreateAddressCollision_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/stRevertTest/RevertDepthCreateAddressCollision_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -252,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x8fdf0036e0550513bf9f4bd99a237d20935912f875a22a75aa8c86e0626a805b",
-                    "mixHash" : "0x070c48ffc09436ca01827ed2f8360ceb428adf8fb62974cb92d5f42976b017af",
-                    "nonce" : "0x06269065bd49fe9a",
+                    "hash" : "0xb80c4549ed8578852aeb12393a43b0b340844b9315d3719d711f64746950a572",
+                    "mixHash" : "0xbf09d288edb5b1f314183c6b59f5b6b5d16b5d8ccd964fb3a787f24252045218",
+                    "nonce" : "0xba3a0b090742ad39",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
                     "receiptTrie" : "0xc179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fa",
@@ -263,7 +277,7 @@
                     "transactionsTrie" : "0x23c0d3758fafe8091129eb77acb4a8b0539a98f61ab9973403ef5ccdda568c54",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea023c0d3758fafe8091129eb77acb4a8b0539a98f61ab9973403ef5ccdda568c54a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0070c48ffc09436ca01827ed2f8360ceb428adf8fb62974cb92d5f42976b017af8806269065bd49fe9af882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601ca052440d702c31ca78d1e89a9f5f0ee6554bda5a781b175ae21edf7594bd6cc7e9a052e53542b83c552eecd9afc95cab350d90c4b1f9ce536353e68fb96c06b69df1c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea023c0d3758fafe8091129eb77acb4a8b0539a98f61ab9973403ef5ccdda568c54a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0bf09d288edb5b1f314183c6b59f5b6b5d16b5d8ccd964fb3a787f2425204521888ba3a0b090742ad39f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601ca052440d702c31ca78d1e89a9f5f0ee6554bda5a781b175ae21edf7594bd6cc7e9a052e53542b83c552eecd9afc95cab350d90c4b1f9ce536353e68fb96c06b69df1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -300,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8fdf0036e0550513bf9f4bd99a237d20935912f875a22a75aa8c86e0626a805b",
-        "network" : "Frontier",
+        "lastblockhash" : "0xb80c4549ed8578852aeb12393a43b0b340844b9315d3719d711f64746950a572",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
@@ -356,10 +370,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d0g0v0_Homestead" : {
+    "RevertDepthCreateAddressCollision_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/stRevertTest/RevertDepthCreateAddressCollision_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -371,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x27bba13692c8457b66f38af68efc24a798814ff0cac938506632f306604aebe5",
-                    "mixHash" : "0xe97377f81853f09ef2c5ec37d6348bbde6801ee5668cfa8d3c1a3199c79d8a0d",
-                    "nonce" : "0xaf370d161ae50437",
+                    "hash" : "0x0921a4f7e3f168730c1c54cd7ac980e3ecdc4526df45432f1ca275823e1c5064",
+                    "mixHash" : "0x48100f6248f088c7c4323aac4778157c59b576841e6613b19c80509c3eebc4b6",
+                    "nonce" : "0x60ebf37cd8b17833",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
                     "receiptTrie" : "0xc179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fa",
@@ -382,7 +396,7 @@
                     "transactionsTrie" : "0x23c0d3758fafe8091129eb77acb4a8b0539a98f61ab9973403ef5ccdda568c54",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea023c0d3758fafe8091129eb77acb4a8b0539a98f61ab9973403ef5ccdda568c54a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0e97377f81853f09ef2c5ec37d6348bbde6801ee5668cfa8d3c1a3199c79d8a0d88af370d161ae50437f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601ca052440d702c31ca78d1e89a9f5f0ee6554bda5a781b175ae21edf7594bd6cc7e9a052e53542b83c552eecd9afc95cab350d90c4b1f9ce536353e68fb96c06b69df1c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea023c0d3758fafe8091129eb77acb4a8b0539a98f61ab9973403ef5ccdda568c54a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a048100f6248f088c7c4323aac4778157c59b576841e6613b19c80509c3eebc4b68860ebf37cd8b17833f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601ca052440d702c31ca78d1e89a9f5f0ee6554bda5a781b175ae21edf7594bd6cc7e9a052e53542b83c552eecd9afc95cab350d90c4b1f9ce536353e68fb96c06b69df1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -419,8 +433,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x27bba13692c8457b66f38af68efc24a798814ff0cac938506632f306604aebe5",
-        "network" : "Homestead",
+        "lastblockhash" : "0x0921a4f7e3f168730c1c54cd7ac980e3ecdc4526df45432f1ca275823e1c5064",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
@@ -475,10 +489,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d0g0v0_Metropolis" : {
+    "RevertDepthCreateAddressCollision_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/stRevertTest/RevertDepthCreateAddressCollision_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -490,18 +504,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0xa42c7befdd48f23968b1d1f8f3497e5e58af37250a9beffdf3adfa1d340d76dd",
-                    "mixHash" : "0x51709397db018806c6b13e6a1011998e8853e7c38baaf8f4adf3cfbf893f331c",
-                    "nonce" : "0x111ea7c056a584e4",
+                    "hash" : "0xbc180b1d308f62ec54227d5de00b2c1527b94bbb8b4b5aa84b34020c84af2b6e",
+                    "mixHash" : "0x98dccf8b4bc3b6185a2b3549b61113043ac127ff417d2adba3bfff2078b48175",
+                    "nonce" : "0xb46a7e3cf56f5357",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
-                    "stateRoot" : "0x5f014c1da847c7a2178e36135d6ff7cb2639d0eb6363e4e4e65a8d1c0dbc3bde",
+                    "receiptTrie" : "0xc179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fa",
+                    "stateRoot" : "0x4e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x23c0d3758fafe8091129eb77acb4a8b0539a98f61ab9973403ef5ccdda568c54",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05f014c1da847c7a2178e36135d6ff7cb2639d0eb6363e4e4e65a8d1c0dbc3bdea023c0d3758fafe8091129eb77acb4a8b0539a98f61ab9973403ef5ccdda568c54a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a051709397db018806c6b13e6a1011998e8853e7c38baaf8f4adf3cfbf893f331c88111ea7c056a584e4f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601ca052440d702c31ca78d1e89a9f5f0ee6554bda5a781b175ae21edf7594bd6cc7e9a052e53542b83c552eecd9afc95cab350d90c4b1f9ce536353e68fb96c06b69df1c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea023c0d3758fafe8091129eb77acb4a8b0539a98f61ab9973403ef5ccdda568c54a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a098dccf8b4bc3b6185a2b3549b61113043ac127ff417d2adba3bfff2078b4817588b46a7e3cf56f5357f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601ca052440d702c31ca78d1e89a9f5f0ee6554bda5a781b175ae21edf7594bd6cc7e9a052e53542b83c552eecd9afc95cab350d90c4b1f9ce536353e68fb96c06b69df1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -538,16 +552,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa42c7befdd48f23968b1d1f8f3497e5e58af37250a9beffdf3adfa1d340d76dd",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xbc180b1d308f62ec54227d5de00b2c1527b94bbb8b4b5aa84b34020c84af2b6e",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5adb0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a36250",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertDepthCreateAddressCollision_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x50dfb67d9e259cd7b1e9af4a63db82ce6bd91386dbb5b6ae0c63f6bb7c77867f",
+                    "mixHash" : "0xd9b4fb70742b422c09a992addced214458be6ec013d6af8e3e91a788b5adab2c",
+                    "nonce" : "0x583fdf3281b9df8a",
+                    "number" : "0x01",
+                    "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
+                    "receiptTrie" : "0xc179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fa",
+                    "stateRoot" : "0x4e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x23c0d3758fafe8091129eb77acb4a8b0539a98f61ab9973403ef5ccdda568c54",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea023c0d3758fafe8091129eb77acb4a8b0539a98f61ab9973403ef5ccdda568c54a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0d9b4fb70742b422c09a992addced214458be6ec013d6af8e3e91a788b5adab2c88583fdf3281b9df8af882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601ca052440d702c31ca78d1e89a9f5f0ee6554bda5a781b175ae21edf7594bd6cc7e9a052e53542b83c552eecd9afc95cab350d90c4b1f9ce536353e68fb96c06b69df1c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x52440d702c31ca78d1e89a9f5f0ee6554bda5a781b175ae21edf7594bd6cc7e9",
+                        "s" : "0x52e53542b83c552eecd9afc95cab350d90c4b1f9ce536353e68fb96c06b69df1",
+                        "to" : "0x3e180b1862f9d158abb5e519a6d8605540c23682",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x50dfb67d9e259cd7b1e9af4a63db82ce6bd91386dbb5b6ae0c63f6bb7c77867f",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d0g0v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d0g0v1.json
index d1d1718da..3f6024199 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d0g0v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d0g0v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertDepthCreateAddressCollision_d0g0v1_EIP150" : {
+    "RevertDepthCreateAddressCollision_d0g0v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x69e64253b9daf06d50a9133ebdb5f821f5c649a28a9c3520671619c8ef5b1171",
-                    "mixHash" : "0x89251b6e3c9517c0150a0b6a50b8fc2bbcefb9186f8055839894df420dc9bf8c",
-                    "nonce" : "0x9ddad84dc749b04a",
+                    "hash" : "0xa2816676a24e427ca16fba774d1a7722aef062a9bbae644abc6210affaac4001",
+                    "mixHash" : "0x2ddd596aff4415418be9e2795884a6f482d31ac904bfc58b8524877ac030c91b",
+                    "nonce" : "0x3e63b2afc7d7d3ab",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0xc179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fa",
-                    "stateRoot" : "0x4e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083e",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x5f014c1da847c7a2178e36135d6ff7cb2639d0eb6363e4e4e65a8d1c0dbc3bde",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xefc73fbab984f5ebfa015cc648f13bdb54da1b41c87f3cdb2d9c5bb397fc3209",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea0efc73fbab984f5ebfa015cc648f13bdb54da1b41c87f3cdb2d9c5bb397fc3209a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a089251b6e3c9517c0150a0b6a50b8fc2bbcefb9186f8055839894df420dc9bf8c889ddad84dc749b04af882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000000ea601ba053df2851760e6b130457296ef1feee0cff28344931e86addf1268d94e3fa3c14a07480574e4c870f6562875a39d6a6931ef7ed2adb615879b8446c4d89bc6b4742c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05f014c1da847c7a2178e36135d6ff7cb2639d0eb6363e4e4e65a8d1c0dbc3bdea0efc73fbab984f5ebfa015cc648f13bdb54da1b41c87f3cdb2d9c5bb397fc3209a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a02ddd596aff4415418be9e2795884a6f482d31ac904bfc58b8524877ac030c91b883e63b2afc7d7d3abf882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000000ea601ba053df2851760e6b130457296ef1feee0cff28344931e86addf1268d94e3fa3c14a07480574e4c870f6562875a39d6a6931ef7ed2adb615879b8446c4d89bc6b4742c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x69e64253b9daf06d50a9133ebdb5f821f5c649a28a9c3520671619c8ef5b1171",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa2816676a24e427ca16fba774d1a7722aef062a9bbae644abc6210affaac4001",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
                 "code" : "",
@@ -118,10 +125,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d0g0v1_EIP158" : {
+    "RevertDepthCreateAddressCollision_d0g0v1_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -133,18 +140,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x239acde3ecdf09e610c44873cf001815659139ef708330b86ad2a2c1ffcf1a90",
-                    "mixHash" : "0x5f7e3aa5740dc7abdbe045d08abe30b71079f0c3236f3284109b960644d03a04",
-                    "nonce" : "0xef57eab7b2e86890",
+                    "hash" : "0x1649b0dddb706698b5bc2fc3b65ed42594c5e9c617e1fe018bf797f25caff1f2",
+                    "mixHash" : "0x086b47e2140d050bd9904c83a3b06ebb52c52eb18b935d73b996496af3c09be5",
+                    "nonce" : "0xb097567d34606b04",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0xc179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fa",
-                    "stateRoot" : "0x4e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083e",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x5f014c1da847c7a2178e36135d6ff7cb2639d0eb6363e4e4e65a8d1c0dbc3bde",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xefc73fbab984f5ebfa015cc648f13bdb54da1b41c87f3cdb2d9c5bb397fc3209",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea0efc73fbab984f5ebfa015cc648f13bdb54da1b41c87f3cdb2d9c5bb397fc3209a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a05f7e3aa5740dc7abdbe045d08abe30b71079f0c3236f3284109b960644d03a0488ef57eab7b2e86890f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000000ea601ba053df2851760e6b130457296ef1feee0cff28344931e86addf1268d94e3fa3c14a07480574e4c870f6562875a39d6a6931ef7ed2adb615879b8446c4d89bc6b4742c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05f014c1da847c7a2178e36135d6ff7cb2639d0eb6363e4e4e65a8d1c0dbc3bdea0efc73fbab984f5ebfa015cc648f13bdb54da1b41c87f3cdb2d9c5bb397fc3209a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0086b47e2140d050bd9904c83a3b06ebb52c52eb18b935d73b996496af3c09be588b097567d34606b04f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000000ea601ba053df2851760e6b130457296ef1feee0cff28344931e86addf1268d94e3fa3c14a07480574e4c870f6562875a39d6a6931ef7ed2adb615879b8446c4d89bc6b4742c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -181,9 +188,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x239acde3ecdf09e610c44873cf001815659139ef708330b86ad2a2c1ffcf1a90",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1649b0dddb706698b5bc2fc3b65ed42594c5e9c617e1fe018bf797f25caff1f2",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
                 "code" : "",
@@ -237,10 +251,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d0g0v1_Frontier" : {
+    "RevertDepthCreateAddressCollision_d0g0v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -252,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0xbe722797ac8cdab1c5970c2bdfbf5337c6e55b234faa6845ac6b1948fe110695",
-                    "mixHash" : "0x0a2a89f7b447374093ffe31875f0d40c5dfb373cd3c7dbb777a05cb2226e503d",
-                    "nonce" : "0x0a2275124040b4ae",
+                    "hash" : "0x8cfa59709170d95094b0c3e56fae2c73bde990cd6930b0b2320a6e24edb78533",
+                    "mixHash" : "0xa4a4a0ebf7cc5bc83d605b1fe5b880836fc38b1aa5213b3a596ae0d96a5c7f14",
+                    "nonce" : "0x8a1ba80732180a24",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
                     "receiptTrie" : "0xc179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fa",
@@ -263,7 +277,7 @@
                     "transactionsTrie" : "0xefc73fbab984f5ebfa015cc648f13bdb54da1b41c87f3cdb2d9c5bb397fc3209",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea0efc73fbab984f5ebfa015cc648f13bdb54da1b41c87f3cdb2d9c5bb397fc3209a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a00a2a89f7b447374093ffe31875f0d40c5dfb373cd3c7dbb777a05cb2226e503d880a2275124040b4aef882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000000ea601ba053df2851760e6b130457296ef1feee0cff28344931e86addf1268d94e3fa3c14a07480574e4c870f6562875a39d6a6931ef7ed2adb615879b8446c4d89bc6b4742c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea0efc73fbab984f5ebfa015cc648f13bdb54da1b41c87f3cdb2d9c5bb397fc3209a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0a4a4a0ebf7cc5bc83d605b1fe5b880836fc38b1aa5213b3a596ae0d96a5c7f14888a1ba80732180a24f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000000ea601ba053df2851760e6b130457296ef1feee0cff28344931e86addf1268d94e3fa3c14a07480574e4c870f6562875a39d6a6931ef7ed2adb615879b8446c4d89bc6b4742c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -300,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbe722797ac8cdab1c5970c2bdfbf5337c6e55b234faa6845ac6b1948fe110695",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8cfa59709170d95094b0c3e56fae2c73bde990cd6930b0b2320a6e24edb78533",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
@@ -356,10 +370,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d0g0v1_Homestead" : {
+    "RevertDepthCreateAddressCollision_d0g0v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -371,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x7feec10f08b6a28f95435fb1dc0b7eb77c96dd5f1c77a0e81ef61827db342b8e",
-                    "mixHash" : "0x4f26df1e460818c010dd668b950c1dc99368206221ad57d87905961172969d89",
-                    "nonce" : "0xb8654d274b307adc",
+                    "hash" : "0xd7c49ee110fec5b717f7468c72a677c37065558a2968afb7739f543d572fdc6f",
+                    "mixHash" : "0x23dfeb1d3792c3abc3e5b734fe36864f19c4b5c33f0f7daf1fd089c46cbaedc9",
+                    "nonce" : "0x9c409c4a2dbbd7b9",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
                     "receiptTrie" : "0xc179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fa",
@@ -382,7 +396,7 @@
                     "transactionsTrie" : "0xefc73fbab984f5ebfa015cc648f13bdb54da1b41c87f3cdb2d9c5bb397fc3209",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea0efc73fbab984f5ebfa015cc648f13bdb54da1b41c87f3cdb2d9c5bb397fc3209a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a04f26df1e460818c010dd668b950c1dc99368206221ad57d87905961172969d8988b8654d274b307adcf882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000000ea601ba053df2851760e6b130457296ef1feee0cff28344931e86addf1268d94e3fa3c14a07480574e4c870f6562875a39d6a6931ef7ed2adb615879b8446c4d89bc6b4742c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea0efc73fbab984f5ebfa015cc648f13bdb54da1b41c87f3cdb2d9c5bb397fc3209a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a023dfeb1d3792c3abc3e5b734fe36864f19c4b5c33f0f7daf1fd089c46cbaedc9889c409c4a2dbbd7b9f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000000ea601ba053df2851760e6b130457296ef1feee0cff28344931e86addf1268d94e3fa3c14a07480574e4c870f6562875a39d6a6931ef7ed2adb615879b8446c4d89bc6b4742c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -419,8 +433,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7feec10f08b6a28f95435fb1dc0b7eb77c96dd5f1c77a0e81ef61827db342b8e",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd7c49ee110fec5b717f7468c72a677c37065558a2968afb7739f543d572fdc6f",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
@@ -475,10 +489,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d0g0v1_Metropolis" : {
+    "RevertDepthCreateAddressCollision_d0g0v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -490,18 +504,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x5c355c9b21a49837cdbe48c5bda9b9e8e6c2c151f36c4a25f5b6f1df16dfc015",
-                    "mixHash" : "0x9793b92567b5b48f2598873cd2ce435203a14457d1601ca841e3f6d549fb87f1",
-                    "nonce" : "0x53c08b0f1a00c541",
+                    "hash" : "0x6f52e7a6ced22061b2ab33d22ec0028d09205d2e3e2cc806b9b211fdd047a436",
+                    "mixHash" : "0x01662b8be877118f85373b3180c958608ffbef6668395573f9fa0eeffc30aa41",
+                    "nonce" : "0x03da2d66a8bc8e59",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
-                    "stateRoot" : "0x5f014c1da847c7a2178e36135d6ff7cb2639d0eb6363e4e4e65a8d1c0dbc3bde",
+                    "receiptTrie" : "0xc179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fa",
+                    "stateRoot" : "0x4e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xefc73fbab984f5ebfa015cc648f13bdb54da1b41c87f3cdb2d9c5bb397fc3209",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05f014c1da847c7a2178e36135d6ff7cb2639d0eb6363e4e4e65a8d1c0dbc3bdea0efc73fbab984f5ebfa015cc648f13bdb54da1b41c87f3cdb2d9c5bb397fc3209a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a09793b92567b5b48f2598873cd2ce435203a14457d1601ca841e3f6d549fb87f18853c08b0f1a00c541f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000000ea601ba053df2851760e6b130457296ef1feee0cff28344931e86addf1268d94e3fa3c14a07480574e4c870f6562875a39d6a6931ef7ed2adb615879b8446c4d89bc6b4742c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea0efc73fbab984f5ebfa015cc648f13bdb54da1b41c87f3cdb2d9c5bb397fc3209a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a001662b8be877118f85373b3180c958608ffbef6668395573f9fa0eeffc30aa418803da2d66a8bc8e59f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000000ea601ba053df2851760e6b130457296ef1feee0cff28344931e86addf1268d94e3fa3c14a07480574e4c870f6562875a39d6a6931ef7ed2adb615879b8446c4d89bc6b4742c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -538,16 +552,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5c355c9b21a49837cdbe48c5bda9b9e8e6c2c151f36c4a25f5b6f1df16dfc015",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6f52e7a6ced22061b2ab33d22ec0028d09205d2e3e2cc806b9b211fdd047a436",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5adb0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a36250",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertDepthCreateAddressCollision_d0g0v1_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g0v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0xfdc5e54667f1a6d61e25f4ea4df4b6f98d77623d6673349e934742718760b231",
+                    "mixHash" : "0xf097f723d7647078146c8bd39bce08f475b2b40ceabb969411acec487d65b1a7",
+                    "nonce" : "0x795cc2280e1b161b",
+                    "number" : "0x01",
+                    "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
+                    "receiptTrie" : "0xc179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fa",
+                    "stateRoot" : "0x4e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xefc73fbab984f5ebfa015cc648f13bdb54da1b41c87f3cdb2d9c5bb397fc3209",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea0efc73fbab984f5ebfa015cc648f13bdb54da1b41c87f3cdb2d9c5bb397fc3209a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0f097f723d7647078146c8bd39bce08f475b2b40ceabb969411acec487d65b1a788795cc2280e1b161bf882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000000ea601ba053df2851760e6b130457296ef1feee0cff28344931e86addf1268d94e3fa3c14a07480574e4c870f6562875a39d6a6931ef7ed2adb615879b8446c4d89bc6b4742c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x53df2851760e6b130457296ef1feee0cff28344931e86addf1268d94e3fa3c14",
+                        "s" : "0x7480574e4c870f6562875a39d6a6931ef7ed2adb615879b8446c4d89bc6b4742",
+                        "to" : "0x3e180b1862f9d158abb5e519a6d8605540c23682",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfdc5e54667f1a6d61e25f4ea4df4b6f98d77623d6673349e934742718760b231",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d0g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d0g1v0.json
index 4958bb9dd..af43bdbac 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertDepthCreateAddressCollision_d0g1v0_EIP150" : {
+    "RevertDepthCreateAddressCollision_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01f013",
-                    "hash" : "0x085f3ec727683309e1fdb0ce5c28d9c0dbb8c5493f9349c5e16b4abad9825376",
-                    "mixHash" : "0x8f0c399241f9e338f64ff3a0fbce4e008fb7525a97d0182fe82214d633992570",
-                    "nonce" : "0x99a55bcd4a829eae",
+                    "hash" : "0x0d5a33853f5e160699c54112ec638b132ec91c22ce87b1d22ef76e24d2594d75",
+                    "mixHash" : "0x8c9111350506661f75b0ca3dd76d6c69e9d566241377cc84cb37b70baff39a95",
+                    "nonce" : "0x1dc9a37d7a22984e",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0x9aa45e9ea780064d2b5e874229ee9e0f7ff154b5e45fecbd508a1b832ce3d847",
-                    "stateRoot" : "0xbf15db9b31ebfc50677a9c978802f07f1253b011ffcb7ba06fdced53c7a287d6",
+                    "receiptTrie" : "0xc45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11",
+                    "stateRoot" : "0x7ce9512cfd37fb04dbef5a1740e5584efe6587afdb6d855237335e0bfebafcca",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xeedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf15db9b31ebfc50677a9c978802f07f1253b011ffcb7ba06fdced53c7a287d6a0eedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602a09aa45e9ea780064d2b5e874229ee9e0f7ff154b5e45fecbd508a1b832ce3d847b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a08f0c399241f9e338f64ff3a0fbce4e008fb7525a97d0182fe82214d6339925708899a55bcd4a829eaef881f87f800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601b9f8b930a856a38429c61839f236a248a37597705b23d584f4c1bb1c801c05cb3a02e5d912c48763771022d94171cfd7ce27c3b35b9ad3aa0b959c40a52ef58dba2c0",
+                "rlp" : "0xf9027ff901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ce9512cfd37fb04dbef5a1740e5584efe6587afdb6d855237335e0bfebafccaa0eedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602a0c45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a08c9111350506661f75b0ca3dd76d6c69e9d566241377cc84cb37b70baff39a95881dc9a37d7a22984ef881f87f800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601b9f8b930a856a38429c61839f236a248a37597705b23d584f4c1bb1c801c05cb3a02e5d912c48763771022d94171cfd7ce27c3b35b9ad3aa0b959c40a52ef58dba2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x085f3ec727683309e1fdb0ce5c28d9c0dbb8c5493f9349c5e16b4abad9825376",
-        "network" : "EIP150",
+        "lastblockhash" : "0x0d5a33853f5e160699c54112ec638b132ec91c22ce87b1d22ef76e24d2594d75",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5f013",
                 "code" : "",
@@ -120,10 +127,138 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d0g1v0_EIP158" : {
+    "RevertDepthCreateAddressCollision_d0g1v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01f013",
+                    "hash" : "0x953a21c59332f6389dd1a93182a82f78fa288ffdf8dd1c8d058f532fcae9c455",
+                    "mixHash" : "0x2cc2fd51443769eabec92690ab538ba4b7044933b7b1055cdf25c247469e4a6e",
+                    "nonce" : "0x5eb296283700e520",
+                    "number" : "0x01",
+                    "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
+                    "receiptTrie" : "0xc45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11",
+                    "stateRoot" : "0x7ce9512cfd37fb04dbef5a1740e5584efe6587afdb6d855237335e0bfebafcca",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xeedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9027ff901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ce9512cfd37fb04dbef5a1740e5584efe6587afdb6d855237335e0bfebafccaa0eedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602a0c45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a02cc2fd51443769eabec92690ab538ba4b7044933b7b1055cdf25c247469e4a6e885eb296283700e520f881f87f800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601b9f8b930a856a38429c61839f236a248a37597705b23d584f4c1bb1c801c05cb3a02e5d912c48763771022d94171cfd7ce27c3b35b9ad3aa0b959c40a52ef58dba2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
+                        "gasLimit" : "0x027100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8b930a856a38429c61839f236a248a37597705b23d584f4c1bb1c801c05cb3",
+                        "s" : "0x2e5d912c48763771022d94171cfd7ce27c3b35b9ad3aa0b959c40a52ef58dba2",
+                        "to" : "0x3e180b1862f9d158abb5e519a6d8605540c23682",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x953a21c59332f6389dd1a93182a82f78fa288ffdf8dd1c8d058f532fcae9c455",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5f013",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                "balance" : "0x06",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x04" : "0x0c"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a31fec",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertDepthCreateAddressCollision_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -135,9 +270,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01f013",
-                    "hash" : "0xf69304fb1c3f00514c509c0a115d80b3e2755f738cb9c74a92fee1245b0cd107",
-                    "mixHash" : "0x4911f1fced7124888f14a89bb09126a199c3b2033b902ad62e8d27272a4ac4a7",
-                    "nonce" : "0x7006f4aa7c241538",
+                    "hash" : "0xd84373090491914721c7944d9085ee713aebe8809177b1d5e3d9c5b8a1b97722",
+                    "mixHash" : "0xa4bfa0845de51ae54d4f6e9305f7734f068cc122bfdb82091cebb35a205b5d39",
+                    "nonce" : "0x0576f5c7c8f4f8ff",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
                     "receiptTrie" : "0x9aa45e9ea780064d2b5e874229ee9e0f7ff154b5e45fecbd508a1b832ce3d847",
@@ -146,7 +281,7 @@
                     "transactionsTrie" : "0xeedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf15db9b31ebfc50677a9c978802f07f1253b011ffcb7ba06fdced53c7a287d6a0eedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602a09aa45e9ea780064d2b5e874229ee9e0f7ff154b5e45fecbd508a1b832ce3d847b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a04911f1fced7124888f14a89bb09126a199c3b2033b902ad62e8d27272a4ac4a7887006f4aa7c241538f881f87f800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601b9f8b930a856a38429c61839f236a248a37597705b23d584f4c1bb1c801c05cb3a02e5d912c48763771022d94171cfd7ce27c3b35b9ad3aa0b959c40a52ef58dba2c0",
+                "rlp" : "0xf9027ff901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf15db9b31ebfc50677a9c978802f07f1253b011ffcb7ba06fdced53c7a287d6a0eedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602a09aa45e9ea780064d2b5e874229ee9e0f7ff154b5e45fecbd508a1b832ce3d847b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a0a4bfa0845de51ae54d4f6e9305f7734f068cc122bfdb82091cebb35a205b5d39880576f5c7c8f4f8fff881f87f800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601b9f8b930a856a38429c61839f236a248a37597705b23d584f4c1bb1c801c05cb3a02e5d912c48763771022d94171cfd7ce27c3b35b9ad3aa0b959c40a52ef58dba2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -183,8 +318,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf69304fb1c3f00514c509c0a115d80b3e2755f738cb9c74a92fee1245b0cd107",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd84373090491914721c7944d9085ee713aebe8809177b1d5e3d9c5b8a1b97722",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5f013",
@@ -241,10 +376,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d0g1v0_Frontier" : {
+    "RevertDepthCreateAddressCollision_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -255,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01ed7f",
-                    "hash" : "0x164bf69dff561c0af7a4f81170ac823b6504538633d90f071afc9afc6e7533e6",
-                    "mixHash" : "0x716b8c56beee30d94d18b54919d3f1e52823eda44c4c568949be3a7f0f359af3",
-                    "nonce" : "0x6accb9786b9509f1",
+                    "gasUsed" : "0x01f013",
+                    "hash" : "0x474ae93aea1c6468558d52104fe209295e0e7833ed90cb123dace6cecafd575d",
+                    "mixHash" : "0xe3aa6f4f5dfbfeef5cc074f6c50b0c4ef4a51888b1f32a73139c97d8082b20cf",
+                    "nonce" : "0xa210f985ee783fe4",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0x5b4b97824db32a86942d9ff562deb8bbd1410673a40c723f030236574c3df113",
-                    "stateRoot" : "0x218250bc4eb2802f8f372c206e72fb8c8bb6959cd6b31bb22cf04ea0e93781fa",
+                    "receiptTrie" : "0x9aa45e9ea780064d2b5e874229ee9e0f7ff154b5e45fecbd508a1b832ce3d847",
+                    "stateRoot" : "0xbf15db9b31ebfc50677a9c978802f07f1253b011ffcb7ba06fdced53c7a287d6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xeedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0218250bc4eb2802f8f372c206e72fb8c8bb6959cd6b31bb22cf04ea0e93781faa0eedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602a05b4b97824db32a86942d9ff562deb8bbd1410673a40c723f030236574c3df113b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ed7f8203e880a0716b8c56beee30d94d18b54919d3f1e52823eda44c4c568949be3a7f0f359af3886accb9786b9509f1f881f87f800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601b9f8b930a856a38429c61839f236a248a37597705b23d584f4c1bb1c801c05cb3a02e5d912c48763771022d94171cfd7ce27c3b35b9ad3aa0b959c40a52ef58dba2c0",
+                "rlp" : "0xf9027ff901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf15db9b31ebfc50677a9c978802f07f1253b011ffcb7ba06fdced53c7a287d6a0eedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602a09aa45e9ea780064d2b5e874229ee9e0f7ff154b5e45fecbd508a1b832ce3d847b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a0e3aa6f4f5dfbfeef5cc074f6c50b0c4ef4a51888b1f32a73139c97d8082b20cf88a210f985ee783fe4f881f87f800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601b9f8b930a856a38429c61839f236a248a37597705b23d584f4c1bb1c801c05cb3a02e5d912c48763771022d94171cfd7ce27c3b35b9ad3aa0b959c40a52ef58dba2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -304,11 +439,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x164bf69dff561c0af7a4f81170ac823b6504538633d90f071afc9afc6e7533e6",
-        "network" : "Frontier",
+        "lastblockhash" : "0x474ae93aea1c6468558d52104fe209295e0e7833ed90cb123dace6cecafd575d",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5ed7f",
+                "balance" : "0x4563918244f5f013",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -324,7 +459,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a32280",
+                "balance" : "0xe8d4a31fec",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -362,10 +497,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d0g1v0_Homestead" : {
+    "RevertDepthCreateAddressCollision_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +512,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01ed7f",
-                    "hash" : "0x004b2d27354cb4aa7a4e75867b5c0e9f32df677976af08e475f67a10d9301a9e",
-                    "mixHash" : "0x9c6a16351d88fb19c2d2b7c688485d8b29b8667da0f16d6e5353abde7a6651df",
-                    "nonce" : "0xf755a9120efdd538",
+                    "hash" : "0xe4821b42c431942553797dbd451e037b0ce4d3e9b24a3426249461f307a40ecc",
+                    "mixHash" : "0xcf1ebed6c86f8da32324881a4ec0a5bc1f21d37b28e40c57ad6f9bc4f3a2f2c5",
+                    "nonce" : "0x05b997e2c8410e39",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
                     "receiptTrie" : "0x5b4b97824db32a86942d9ff562deb8bbd1410673a40c723f030236574c3df113",
@@ -388,7 +523,7 @@
                     "transactionsTrie" : "0xeedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0218250bc4eb2802f8f372c206e72fb8c8bb6959cd6b31bb22cf04ea0e93781faa0eedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602a05b4b97824db32a86942d9ff562deb8bbd1410673a40c723f030236574c3df113b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ed7f8203e880a09c6a16351d88fb19c2d2b7c688485d8b29b8667da0f16d6e5353abde7a6651df88f755a9120efdd538f881f87f800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601b9f8b930a856a38429c61839f236a248a37597705b23d584f4c1bb1c801c05cb3a02e5d912c48763771022d94171cfd7ce27c3b35b9ad3aa0b959c40a52ef58dba2c0",
+                "rlp" : "0xf9027ff901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0218250bc4eb2802f8f372c206e72fb8c8bb6959cd6b31bb22cf04ea0e93781faa0eedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602a05b4b97824db32a86942d9ff562deb8bbd1410673a40c723f030236574c3df113b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ed7f8203e880a0cf1ebed6c86f8da32324881a4ec0a5bc1f21d37b28e40c57ad6f9bc4f3a2f2c58805b997e2c8410e39f881f87f800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601b9f8b930a856a38429c61839f236a248a37597705b23d584f4c1bb1c801c05cb3a02e5d912c48763771022d94171cfd7ce27c3b35b9ad3aa0b959c40a52ef58dba2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -425,8 +560,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x004b2d27354cb4aa7a4e75867b5c0e9f32df677976af08e475f67a10d9301a9e",
-        "network" : "Homestead",
+        "lastblockhash" : "0xe4821b42c431942553797dbd451e037b0ce4d3e9b24a3426249461f307a40ecc",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5ed7f",
@@ -483,10 +618,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d0g1v0_Metropolis" : {
+    "RevertDepthCreateAddressCollision_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -497,19 +632,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01f013",
-                    "hash" : "0x2d232113d888ef741aae55a756e8dd3f93274cb8f3146c8b4b6d0b836b5f9ddc",
-                    "mixHash" : "0x75a37983fbb6f82f68d0758a5d7322f8ce5fdb506d5935ac5aa818267548c34b",
-                    "nonce" : "0xf827d2583c3e8892",
+                    "gasUsed" : "0x01ed7f",
+                    "hash" : "0xd5328f99fd5ce42db83eb487df9859f6923c8598e55040eea3733435a28c47ba",
+                    "mixHash" : "0x4997cfb64252af49fc6850dc7e21d4a4feff7566baedb92ac86af62eb8e24141",
+                    "nonce" : "0x38bbdf631bf317d1",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0xc45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11",
-                    "stateRoot" : "0x7ce9512cfd37fb04dbef5a1740e5584efe6587afdb6d855237335e0bfebafcca",
+                    "receiptTrie" : "0x5b4b97824db32a86942d9ff562deb8bbd1410673a40c723f030236574c3df113",
+                    "stateRoot" : "0x218250bc4eb2802f8f372c206e72fb8c8bb6959cd6b31bb22cf04ea0e93781fa",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xeedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ce9512cfd37fb04dbef5a1740e5584efe6587afdb6d855237335e0bfebafccaa0eedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602a0c45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a075a37983fbb6f82f68d0758a5d7322f8ce5fdb506d5935ac5aa818267548c34b88f827d2583c3e8892f881f87f800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601b9f8b930a856a38429c61839f236a248a37597705b23d584f4c1bb1c801c05cb3a02e5d912c48763771022d94171cfd7ce27c3b35b9ad3aa0b959c40a52ef58dba2c0",
+                "rlp" : "0xf9027ff901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0218250bc4eb2802f8f372c206e72fb8c8bb6959cd6b31bb22cf04ea0e93781faa0eedbb2ed5cd67f16cd0134b69d1d8612600008294d81cc7669e4e37f3c499602a05b4b97824db32a86942d9ff562deb8bbd1410673a40c723f030236574c3df113b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ed7f8203e880a04997cfb64252af49fc6850dc7e21d4a4feff7566baedb92ac86af62eb8e241418838bbdf631bf317d1f881f87f800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000000ea601b9f8b930a856a38429c61839f236a248a37597705b23d584f4c1bb1c801c05cb3a02e5d912c48763771022d94171cfd7ce27c3b35b9ad3aa0b959c40a52ef58dba2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -546,18 +681,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2d232113d888ef741aae55a756e8dd3f93274cb8f3146c8b4b6d0b836b5f9ddc",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd5328f99fd5ce42db83eb487df9859f6923c8598e55040eea3733435a28c47ba",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5f013",
+                "balance" : "0x4563918244f5ed7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -573,7 +701,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a31fec",
+                "balance" : "0xe8d4a32280",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d0g1v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d0g1v1.json
index 6d1fc7d32..e9b4020dc 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d0g1v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d0g1v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertDepthCreateAddressCollision_d0g1v1_EIP150" : {
+    "RevertDepthCreateAddressCollision_d0g1v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01f013",
-                    "hash" : "0x034fb204684319522c59471a3fb25be97dca4d5e1216a87dd81435b485c66ecb",
-                    "mixHash" : "0x30cf299c5571dd6624713e9135a3aa0e73b6a49ac70d4536f6d78031edfa100b",
-                    "nonce" : "0x829babc7c7426f82",
+                    "hash" : "0xbf63a97fae2cf26b82a1febdbaf03bd008b3bb6409122d2ec361b35a7caf4fee",
+                    "mixHash" : "0x243fd05b63afbba0e533dad3c05e9080afefa53ee1541a78ddf92960fb69384d",
+                    "nonce" : "0x3b901fe7640436e1",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0xab32e2e4ffbbeea7a553788d667b12084b64e7a2c01a73dc3dfebe8fef185d0b",
-                    "stateRoot" : "0xf31091e739fea287d91a7160051feecc367d0f81e8b3fe75e691916c46b5b1ba",
+                    "receiptTrie" : "0xc45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11",
+                    "stateRoot" : "0x41573c33f7ae7f1a2d70dcbe96600888170d21db7efb6d8d4d4fb95988ac0b05",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59f6b383941cab6ef5f8e49a5bb3c33a84af3ebb170ab1daa5c08b988ab533ff",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f31091e739fea287d91a7160051feecc367d0f81e8b3fe75e691916c46b5b1baa059f6b383941cab6ef5f8e49a5bb3c33a84af3ebb170ab1daa5c08b988ab533ffa0ab32e2e4ffbbeea7a553788d667b12084b64e7a2c01a73dc3dfebe8fef185d0bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a030cf299c5571dd6624713e9135a3aa0e73b6a49ac70d4536f6d78031edfa100b88829babc7c7426f82f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000000ea601ca03a430e0b34be1cfc72849704acc13cef0d5c0c8a3f3738c7c61147cadd42ec11a02605851d8e4ca49c3727910d011d6a7be5b84a58b339d8983a67cd38f77212f4c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041573c33f7ae7f1a2d70dcbe96600888170d21db7efb6d8d4d4fb95988ac0b05a059f6b383941cab6ef5f8e49a5bb3c33a84af3ebb170ab1daa5c08b988ab533ffa0c45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a0243fd05b63afbba0e533dad3c05e9080afefa53ee1541a78ddf92960fb69384d883b901fe7640436e1f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000000ea601ca03a430e0b34be1cfc72849704acc13cef0d5c0c8a3f3738c7c61147cadd42ec11a02605851d8e4ca49c3727910d011d6a7be5b84a58b339d8983a67cd38f77212f4c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x034fb204684319522c59471a3fb25be97dca4d5e1216a87dd81435b485c66ecb",
-        "network" : "EIP150",
+        "lastblockhash" : "0xbf63a97fae2cf26b82a1febdbaf03bd008b3bb6409122d2ec361b35a7caf4fee",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5f013",
                 "code" : "",
@@ -120,10 +127,138 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d0g1v1_EIP158" : {
+    "RevertDepthCreateAddressCollision_d0g1v1_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g1v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01f013",
+                    "hash" : "0x2275f38cae2594f084e2a4642458d8ef153d71e72b1b7089799cdea32ab0fd3d",
+                    "mixHash" : "0x23ff5b0cfcc3a3ec25b3b74ec0b7b129e146828bc415c04d64820f67fa921b29",
+                    "nonce" : "0x594f841741e8dccf",
+                    "number" : "0x01",
+                    "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
+                    "receiptTrie" : "0xc45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11",
+                    "stateRoot" : "0x41573c33f7ae7f1a2d70dcbe96600888170d21db7efb6d8d4d4fb95988ac0b05",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59f6b383941cab6ef5f8e49a5bb3c33a84af3ebb170ab1daa5c08b988ab533ff",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041573c33f7ae7f1a2d70dcbe96600888170d21db7efb6d8d4d4fb95988ac0b05a059f6b383941cab6ef5f8e49a5bb3c33a84af3ebb170ab1daa5c08b988ab533ffa0c45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a023ff5b0cfcc3a3ec25b3b74ec0b7b129e146828bc415c04d64820f67fa921b2988594f841741e8dccff882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000000ea601ca03a430e0b34be1cfc72849704acc13cef0d5c0c8a3f3738c7c61147cadd42ec11a02605851d8e4ca49c3727910d011d6a7be5b84a58b339d8983a67cd38f77212f4c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
+                        "gasLimit" : "0x027100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3a430e0b34be1cfc72849704acc13cef0d5c0c8a3f3738c7c61147cadd42ec11",
+                        "s" : "0x2605851d8e4ca49c3727910d011d6a7be5b84a58b339d8983a67cd38f77212f4",
+                        "to" : "0x3e180b1862f9d158abb5e519a6d8605540c23682",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2275f38cae2594f084e2a4642458d8ef153d71e72b1b7089799cdea32ab0fd3d",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5f013",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x04" : "0x0c"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a31fed",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertDepthCreateAddressCollision_d0g1v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -135,9 +270,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01f013",
-                    "hash" : "0xd7152e35e7a1e21535d561e1aaf73e957d73a88b61ea3e94b175ec3a550dbded",
-                    "mixHash" : "0xff5c1d4eae20c5f56b353bafc47b65e349616e658f1a471326a1e67e63bb66a3",
-                    "nonce" : "0x91b7bddb705c5146",
+                    "hash" : "0x1d48dea6f38fde5e8fea0f7ae7e205b436b70e473be8a40f2dfd03f99357d608",
+                    "mixHash" : "0x2822d57fe9860b4269eea6dfac5c9ce950afb87631180226e3923f62c17f9af0",
+                    "nonce" : "0x3ba7ea8577eaa28a",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
                     "receiptTrie" : "0xab32e2e4ffbbeea7a553788d667b12084b64e7a2c01a73dc3dfebe8fef185d0b",
@@ -146,7 +281,7 @@
                     "transactionsTrie" : "0x59f6b383941cab6ef5f8e49a5bb3c33a84af3ebb170ab1daa5c08b988ab533ff",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f31091e739fea287d91a7160051feecc367d0f81e8b3fe75e691916c46b5b1baa059f6b383941cab6ef5f8e49a5bb3c33a84af3ebb170ab1daa5c08b988ab533ffa0ab32e2e4ffbbeea7a553788d667b12084b64e7a2c01a73dc3dfebe8fef185d0bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a0ff5c1d4eae20c5f56b353bafc47b65e349616e658f1a471326a1e67e63bb66a38891b7bddb705c5146f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000000ea601ca03a430e0b34be1cfc72849704acc13cef0d5c0c8a3f3738c7c61147cadd42ec11a02605851d8e4ca49c3727910d011d6a7be5b84a58b339d8983a67cd38f77212f4c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f31091e739fea287d91a7160051feecc367d0f81e8b3fe75e691916c46b5b1baa059f6b383941cab6ef5f8e49a5bb3c33a84af3ebb170ab1daa5c08b988ab533ffa0ab32e2e4ffbbeea7a553788d667b12084b64e7a2c01a73dc3dfebe8fef185d0bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a02822d57fe9860b4269eea6dfac5c9ce950afb87631180226e3923f62c17f9af0883ba7ea8577eaa28af882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000000ea601ca03a430e0b34be1cfc72849704acc13cef0d5c0c8a3f3738c7c61147cadd42ec11a02605851d8e4ca49c3727910d011d6a7be5b84a58b339d8983a67cd38f77212f4c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -183,8 +318,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd7152e35e7a1e21535d561e1aaf73e957d73a88b61ea3e94b175ec3a550dbded",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1d48dea6f38fde5e8fea0f7ae7e205b436b70e473be8a40f2dfd03f99357d608",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5f013",
@@ -241,10 +376,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d0g1v1_Frontier" : {
+    "RevertDepthCreateAddressCollision_d0g1v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -255,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01ed7f",
-                    "hash" : "0xf2d13edf91a91033c52c28a62e17d3a9eafa7624cce2d5131e6cb08982d592bc",
-                    "mixHash" : "0x37a213150a80a6f015abbb2dcd5201a9d647a4be04e8c822c9b7309dbcf1e454",
-                    "nonce" : "0x92112e644ca1b372",
+                    "gasUsed" : "0x01f013",
+                    "hash" : "0x7d2d58844d3df08a00246a45a94019b48a2291f03bb62b4de876efc5cd1b9797",
+                    "mixHash" : "0x4a44d1aa2d5c9566766fa063708cd39246f2f5a0b47ef41d10644be42c3e6822",
+                    "nonce" : "0xc8e0ffddcbcbc1d7",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0x81017e54a6f4a206aeec8dca4ea299a53d345494df7449bcc4bdbedde16e6351",
-                    "stateRoot" : "0xb35ed414f0f41463ae8c74c94129782c047e73b0e9a6ed00488fd48c4d1f4ac0",
+                    "receiptTrie" : "0xab32e2e4ffbbeea7a553788d667b12084b64e7a2c01a73dc3dfebe8fef185d0b",
+                    "stateRoot" : "0xf31091e739fea287d91a7160051feecc367d0f81e8b3fe75e691916c46b5b1ba",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59f6b383941cab6ef5f8e49a5bb3c33a84af3ebb170ab1daa5c08b988ab533ff",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b35ed414f0f41463ae8c74c94129782c047e73b0e9a6ed00488fd48c4d1f4ac0a059f6b383941cab6ef5f8e49a5bb3c33a84af3ebb170ab1daa5c08b988ab533ffa081017e54a6f4a206aeec8dca4ea299a53d345494df7449bcc4bdbedde16e6351b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ed7f8203e880a037a213150a80a6f015abbb2dcd5201a9d647a4be04e8c822c9b7309dbcf1e4548892112e644ca1b372f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000000ea601ca03a430e0b34be1cfc72849704acc13cef0d5c0c8a3f3738c7c61147cadd42ec11a02605851d8e4ca49c3727910d011d6a7be5b84a58b339d8983a67cd38f77212f4c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f31091e739fea287d91a7160051feecc367d0f81e8b3fe75e691916c46b5b1baa059f6b383941cab6ef5f8e49a5bb3c33a84af3ebb170ab1daa5c08b988ab533ffa0ab32e2e4ffbbeea7a553788d667b12084b64e7a2c01a73dc3dfebe8fef185d0bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a04a44d1aa2d5c9566766fa063708cd39246f2f5a0b47ef41d10644be42c3e682288c8e0ffddcbcbc1d7f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000000ea601ca03a430e0b34be1cfc72849704acc13cef0d5c0c8a3f3738c7c61147cadd42ec11a02605851d8e4ca49c3727910d011d6a7be5b84a58b339d8983a67cd38f77212f4c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -304,11 +439,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf2d13edf91a91033c52c28a62e17d3a9eafa7624cce2d5131e6cb08982d592bc",
-        "network" : "Frontier",
+        "lastblockhash" : "0x7d2d58844d3df08a00246a45a94019b48a2291f03bb62b4de876efc5cd1b9797",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5ed7f",
+                "balance" : "0x4563918244f5f013",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -324,7 +459,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a32281",
+                "balance" : "0xe8d4a31fed",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -362,10 +497,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d0g1v1_Homestead" : {
+    "RevertDepthCreateAddressCollision_d0g1v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -377,9 +512,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01ed7f",
-                    "hash" : "0x90727a54e9c30a91f7df6904b685cfdaadb5c88aec044eec085800216831120f",
-                    "mixHash" : "0x545c353990c3ec68e8ba3ec76ab5503bc4a05b15c7c4eda6ba7c0c41f3c0aec7",
-                    "nonce" : "0x84a94e2f9d9e259e",
+                    "hash" : "0x2c8a741986be6b4de36a1e0abd6ca82842e809d15bcd205fb81e0a4138a70d75",
+                    "mixHash" : "0x790cafd67046127620d76a8c2389f4944c077c80aff440d95e98e36abd94a620",
+                    "nonce" : "0x37016903441454de",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
                     "receiptTrie" : "0x81017e54a6f4a206aeec8dca4ea299a53d345494df7449bcc4bdbedde16e6351",
@@ -388,7 +523,7 @@
                     "transactionsTrie" : "0x59f6b383941cab6ef5f8e49a5bb3c33a84af3ebb170ab1daa5c08b988ab533ff",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b35ed414f0f41463ae8c74c94129782c047e73b0e9a6ed00488fd48c4d1f4ac0a059f6b383941cab6ef5f8e49a5bb3c33a84af3ebb170ab1daa5c08b988ab533ffa081017e54a6f4a206aeec8dca4ea299a53d345494df7449bcc4bdbedde16e6351b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ed7f8203e880a0545c353990c3ec68e8ba3ec76ab5503bc4a05b15c7c4eda6ba7c0c41f3c0aec78884a94e2f9d9e259ef882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000000ea601ca03a430e0b34be1cfc72849704acc13cef0d5c0c8a3f3738c7c61147cadd42ec11a02605851d8e4ca49c3727910d011d6a7be5b84a58b339d8983a67cd38f77212f4c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b35ed414f0f41463ae8c74c94129782c047e73b0e9a6ed00488fd48c4d1f4ac0a059f6b383941cab6ef5f8e49a5bb3c33a84af3ebb170ab1daa5c08b988ab533ffa081017e54a6f4a206aeec8dca4ea299a53d345494df7449bcc4bdbedde16e6351b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ed7f8203e880a0790cafd67046127620d76a8c2389f4944c077c80aff440d95e98e36abd94a6208837016903441454def882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000000ea601ca03a430e0b34be1cfc72849704acc13cef0d5c0c8a3f3738c7c61147cadd42ec11a02605851d8e4ca49c3727910d011d6a7be5b84a58b339d8983a67cd38f77212f4c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -425,8 +560,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x90727a54e9c30a91f7df6904b685cfdaadb5c88aec044eec085800216831120f",
-        "network" : "Homestead",
+        "lastblockhash" : "0x2c8a741986be6b4de36a1e0abd6ca82842e809d15bcd205fb81e0a4138a70d75",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5ed7f",
@@ -483,10 +618,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d0g1v1_Metropolis" : {
+    "RevertDepthCreateAddressCollision_d0g1v1_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -497,19 +632,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01f013",
-                    "hash" : "0x188ec00b4e4ff3b08f16f68146076170cde0001a3f7237f0c33ed6f83d7ac77f",
-                    "mixHash" : "0xc092222a7bf87e9e846be79f152fbddfd3fa1f794a5bffb14579fbb4dc22762a",
-                    "nonce" : "0x619679b4cef855c6",
+                    "gasUsed" : "0x01ed7f",
+                    "hash" : "0x1176830b60aa708575d02bad46216b1f85cc76a44b29a5d82215fef1cb1eb022",
+                    "mixHash" : "0xe7de800b5d57f7af12a603adadbbce3d47a8652c5b650a228102d28abc11fa06",
+                    "nonce" : "0xae753d34ef8bacb7",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0xc45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11",
-                    "stateRoot" : "0x41573c33f7ae7f1a2d70dcbe96600888170d21db7efb6d8d4d4fb95988ac0b05",
+                    "receiptTrie" : "0x81017e54a6f4a206aeec8dca4ea299a53d345494df7449bcc4bdbedde16e6351",
+                    "stateRoot" : "0xb35ed414f0f41463ae8c74c94129782c047e73b0e9a6ed00488fd48c4d1f4ac0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59f6b383941cab6ef5f8e49a5bb3c33a84af3ebb170ab1daa5c08b988ab533ff",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041573c33f7ae7f1a2d70dcbe96600888170d21db7efb6d8d4d4fb95988ac0b05a059f6b383941cab6ef5f8e49a5bb3c33a84af3ebb170ab1daa5c08b988ab533ffa0c45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a0c092222a7bf87e9e846be79f152fbddfd3fa1f794a5bffb14579fbb4dc22762a88619679b4cef855c6f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000000ea601ca03a430e0b34be1cfc72849704acc13cef0d5c0c8a3f3738c7c61147cadd42ec11a02605851d8e4ca49c3727910d011d6a7be5b84a58b339d8983a67cd38f77212f4c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b35ed414f0f41463ae8c74c94129782c047e73b0e9a6ed00488fd48c4d1f4ac0a059f6b383941cab6ef5f8e49a5bb3c33a84af3ebb170ab1daa5c08b988ab533ffa081017e54a6f4a206aeec8dca4ea299a53d345494df7449bcc4bdbedde16e6351b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ed7f8203e880a0e7de800b5d57f7af12a603adadbbce3d47a8652c5b650a228102d28abc11fa0688ae753d34ef8bacb7f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000000ea601ca03a430e0b34be1cfc72849704acc13cef0d5c0c8a3f3738c7c61147cadd42ec11a02605851d8e4ca49c3727910d011d6a7be5b84a58b339d8983a67cd38f77212f4c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -546,18 +681,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x188ec00b4e4ff3b08f16f68146076170cde0001a3f7237f0c33ed6f83d7ac77f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x1176830b60aa708575d02bad46216b1f85cc76a44b29a5d82215fef1cb1eb022",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5f013",
+                "balance" : "0x4563918244f5ed7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -573,7 +701,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a31fed",
+                "balance" : "0xe8d4a32281",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d1g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d1g0v0.json
index 3de6c485d..752215747 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d1g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d1g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertDepthCreateAddressCollision_d1g0v0_EIP150" : {
+    "RevertDepthCreateAddressCollision_d1g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0xdffab4f293fbb8a0cee257e1dd68a94f70f4c9bddb1f413c8fa2a680fb5005c3",
-                    "mixHash" : "0x1c5c6ac9e5928cf0615b21b897dfc995914e559c22a44f551aee2b24a94bff66",
-                    "nonce" : "0x94c6865fffbf8dbd",
+                    "hash" : "0xd204bdbc1020028b44c1cbbcf3fb7155ecd0f77208bc6bf065defacef7173568",
+                    "mixHash" : "0x5f94abce8a10b39ce07dc3d395f52e403e1d4428db5f0b89c6c07a39125d5073",
+                    "nonce" : "0x34d4d17ff1ea84da",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0xc179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fa",
-                    "stateRoot" : "0x4e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083e",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x5f014c1da847c7a2178e36135d6ff7cb2639d0eb6363e4e4e65a8d1c0dbc3bde",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe7bc843ec5e750fdfdc59b9b72ad4317dfca2bd7a817eac104dd0475b288ebf5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea0e7bc843ec5e750fdfdc59b9b72ad4317dfca2bd7a817eac104dd0475b288ebf5a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a01c5c6ac9e5928cf0615b21b897dfc995914e559c22a44f551aee2b24a94bff668894c6865fffbf8dbdf882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000001ea601ca076dbf27177d8c577beefbbe13c86b656b9c478d49dd912f99999ede610ce5659a01ba504ebbeb5930a9b553778f174f6d2846d9fd5aa025c6f1ae5ed4859a94e2ec0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05f014c1da847c7a2178e36135d6ff7cb2639d0eb6363e4e4e65a8d1c0dbc3bdea0e7bc843ec5e750fdfdc59b9b72ad4317dfca2bd7a817eac104dd0475b288ebf5a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a05f94abce8a10b39ce07dc3d395f52e403e1d4428db5f0b89c6c07a39125d50738834d4d17ff1ea84daf882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000001ea601ca076dbf27177d8c577beefbbe13c86b656b9c478d49dd912f99999ede610ce5659a01ba504ebbeb5930a9b553778f174f6d2846d9fd5aa025c6f1ae5ed4859a94e2ec0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdffab4f293fbb8a0cee257e1dd68a94f70f4c9bddb1f413c8fa2a680fb5005c3",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd204bdbc1020028b44c1cbbcf3fb7155ecd0f77208bc6bf065defacef7173568",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
                 "code" : "",
@@ -118,10 +125,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d1g0v0_EIP158" : {
+    "RevertDepthCreateAddressCollision_d1g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -133,18 +140,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x78df7566dbbdaba4d85bbfbda038480854f7b69e1beefb3809f4a705c6faddfc",
-                    "mixHash" : "0xbf0df9a5fd7327e2bdfb92479e760646c6a3fffe6baf4879dbca0eeefd28ec84",
-                    "nonce" : "0x6cc3a312b1169d77",
+                    "hash" : "0x4a3fce1afdc340cf81bc5d6effc7a23bcca6546ff7ba988d90e2c1d8c9f81823",
+                    "mixHash" : "0xea0c4ca66a86aedd0f398a32937e886ed345e2b7383742b5bc15e1dc688bb550",
+                    "nonce" : "0x97202985b6bc5362",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0xc179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fa",
-                    "stateRoot" : "0x4e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083e",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x5f014c1da847c7a2178e36135d6ff7cb2639d0eb6363e4e4e65a8d1c0dbc3bde",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe7bc843ec5e750fdfdc59b9b72ad4317dfca2bd7a817eac104dd0475b288ebf5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea0e7bc843ec5e750fdfdc59b9b72ad4317dfca2bd7a817eac104dd0475b288ebf5a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0bf0df9a5fd7327e2bdfb92479e760646c6a3fffe6baf4879dbca0eeefd28ec84886cc3a312b1169d77f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000001ea601ca076dbf27177d8c577beefbbe13c86b656b9c478d49dd912f99999ede610ce5659a01ba504ebbeb5930a9b553778f174f6d2846d9fd5aa025c6f1ae5ed4859a94e2ec0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05f014c1da847c7a2178e36135d6ff7cb2639d0eb6363e4e4e65a8d1c0dbc3bdea0e7bc843ec5e750fdfdc59b9b72ad4317dfca2bd7a817eac104dd0475b288ebf5a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0ea0c4ca66a86aedd0f398a32937e886ed345e2b7383742b5bc15e1dc688bb5508897202985b6bc5362f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000001ea601ca076dbf27177d8c577beefbbe13c86b656b9c478d49dd912f99999ede610ce5659a01ba504ebbeb5930a9b553778f174f6d2846d9fd5aa025c6f1ae5ed4859a94e2ec0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -181,9 +188,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x78df7566dbbdaba4d85bbfbda038480854f7b69e1beefb3809f4a705c6faddfc",
-        "network" : "EIP158",
+        "lastblockhash" : "0x4a3fce1afdc340cf81bc5d6effc7a23bcca6546ff7ba988d90e2c1d8c9f81823",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
                 "code" : "",
@@ -237,10 +251,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d1g0v0_Frontier" : {
+    "RevertDepthCreateAddressCollision_d1g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -252,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x255a0c79398350b5c869beacd0514ffe7b387f3f7671265940279129bcda3f0e",
-                    "mixHash" : "0x7b08b71993b28508022c01ec3853d441212a234c435fc0cdf38827b297ef67a5",
-                    "nonce" : "0xc2bb3c5212a19234",
+                    "hash" : "0x01b537cc44f54f5e286ffbdd581e32986c1d7e0c36a0ce9c141a4cd8de1ebc3c",
+                    "mixHash" : "0x012083facd69f03be0794db5aa58e17df549f3ad10505c90cd1a4a9a2a431f7b",
+                    "nonce" : "0x3c0159670cc2c265",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
                     "receiptTrie" : "0xc179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fa",
@@ -263,7 +277,7 @@
                     "transactionsTrie" : "0xe7bc843ec5e750fdfdc59b9b72ad4317dfca2bd7a817eac104dd0475b288ebf5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea0e7bc843ec5e750fdfdc59b9b72ad4317dfca2bd7a817eac104dd0475b288ebf5a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a07b08b71993b28508022c01ec3853d441212a234c435fc0cdf38827b297ef67a588c2bb3c5212a19234f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000001ea601ca076dbf27177d8c577beefbbe13c86b656b9c478d49dd912f99999ede610ce5659a01ba504ebbeb5930a9b553778f174f6d2846d9fd5aa025c6f1ae5ed4859a94e2ec0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea0e7bc843ec5e750fdfdc59b9b72ad4317dfca2bd7a817eac104dd0475b288ebf5a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0012083facd69f03be0794db5aa58e17df549f3ad10505c90cd1a4a9a2a431f7b883c0159670cc2c265f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000001ea601ca076dbf27177d8c577beefbbe13c86b656b9c478d49dd912f99999ede610ce5659a01ba504ebbeb5930a9b553778f174f6d2846d9fd5aa025c6f1ae5ed4859a94e2ec0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -300,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x255a0c79398350b5c869beacd0514ffe7b387f3f7671265940279129bcda3f0e",
-        "network" : "Frontier",
+        "lastblockhash" : "0x01b537cc44f54f5e286ffbdd581e32986c1d7e0c36a0ce9c141a4cd8de1ebc3c",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
@@ -356,10 +370,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d1g0v0_Homestead" : {
+    "RevertDepthCreateAddressCollision_d1g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -371,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0xe6afb27f1eec7ad5d24150e773e2a6199ec89bc5f98d4ce43af5660055685604",
-                    "mixHash" : "0xeed4c33b4ba800709e72ecbe87198235ab233f1503f747f655c5da93a8c6aef8",
-                    "nonce" : "0x5045ce51ee7e21fe",
+                    "hash" : "0x12ecc3c634dcf2eb6d6eb742a93d583354d0248dd2eb7de2626b9e6a1eee3988",
+                    "mixHash" : "0x7cd601d918e0df7781e60152339df0909962956e2d0ffaafb19abb2ef7ecebbb",
+                    "nonce" : "0x5fff34f0aa72e316",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
                     "receiptTrie" : "0xc179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fa",
@@ -382,7 +396,7 @@
                     "transactionsTrie" : "0xe7bc843ec5e750fdfdc59b9b72ad4317dfca2bd7a817eac104dd0475b288ebf5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea0e7bc843ec5e750fdfdc59b9b72ad4317dfca2bd7a817eac104dd0475b288ebf5a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0eed4c33b4ba800709e72ecbe87198235ab233f1503f747f655c5da93a8c6aef8885045ce51ee7e21fef882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000001ea601ca076dbf27177d8c577beefbbe13c86b656b9c478d49dd912f99999ede610ce5659a01ba504ebbeb5930a9b553778f174f6d2846d9fd5aa025c6f1ae5ed4859a94e2ec0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea0e7bc843ec5e750fdfdc59b9b72ad4317dfca2bd7a817eac104dd0475b288ebf5a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a07cd601d918e0df7781e60152339df0909962956e2d0ffaafb19abb2ef7ecebbb885fff34f0aa72e316f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000001ea601ca076dbf27177d8c577beefbbe13c86b656b9c478d49dd912f99999ede610ce5659a01ba504ebbeb5930a9b553778f174f6d2846d9fd5aa025c6f1ae5ed4859a94e2ec0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -419,8 +433,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe6afb27f1eec7ad5d24150e773e2a6199ec89bc5f98d4ce43af5660055685604",
-        "network" : "Homestead",
+        "lastblockhash" : "0x12ecc3c634dcf2eb6d6eb742a93d583354d0248dd2eb7de2626b9e6a1eee3988",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
@@ -475,10 +489,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d1g0v0_Metropolis" : {
+    "RevertDepthCreateAddressCollision_d1g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -490,18 +504,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x106e55a79ac6f9d1bd4a878184321557ad43399ca152ed3fab89f14d39a1e4e4",
-                    "mixHash" : "0x15616e10620a01c1a6ce69359473b05b692a3d7526da309ed1a2a08cc6842fb3",
-                    "nonce" : "0x97449f8f656108ff",
+                    "hash" : "0x16ff44f3fd511ec414a0f0514f889b670ff4d6ea91c7176ee1c06483a09e42f4",
+                    "mixHash" : "0xa9bbc8b49726e8e346a76d69e7bca868ccb6833dc89c436bdead16d2712f4504",
+                    "nonce" : "0x6c30e3ac3f4956f6",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
-                    "stateRoot" : "0x5f014c1da847c7a2178e36135d6ff7cb2639d0eb6363e4e4e65a8d1c0dbc3bde",
+                    "receiptTrie" : "0xc179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fa",
+                    "stateRoot" : "0x4e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe7bc843ec5e750fdfdc59b9b72ad4317dfca2bd7a817eac104dd0475b288ebf5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05f014c1da847c7a2178e36135d6ff7cb2639d0eb6363e4e4e65a8d1c0dbc3bdea0e7bc843ec5e750fdfdc59b9b72ad4317dfca2bd7a817eac104dd0475b288ebf5a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a015616e10620a01c1a6ce69359473b05b692a3d7526da309ed1a2a08cc6842fb38897449f8f656108fff882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000001ea601ca076dbf27177d8c577beefbbe13c86b656b9c478d49dd912f99999ede610ce5659a01ba504ebbeb5930a9b553778f174f6d2846d9fd5aa025c6f1ae5ed4859a94e2ec0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea0e7bc843ec5e750fdfdc59b9b72ad4317dfca2bd7a817eac104dd0475b288ebf5a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0a9bbc8b49726e8e346a76d69e7bca868ccb6833dc89c436bdead16d2712f4504886c30e3ac3f4956f6f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000001ea601ca076dbf27177d8c577beefbbe13c86b656b9c478d49dd912f99999ede610ce5659a01ba504ebbeb5930a9b553778f174f6d2846d9fd5aa025c6f1ae5ed4859a94e2ec0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -538,16 +552,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x106e55a79ac6f9d1bd4a878184321557ad43399ca152ed3fab89f14d39a1e4e4",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x16ff44f3fd511ec414a0f0514f889b670ff4d6ea91c7176ee1c06483a09e42f4",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5adb0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a36250",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertDepthCreateAddressCollision_d1g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x65473961f4b48599ca66b5d23fd850509b3891213888b51a6b93cff5f9f393ca",
+                    "mixHash" : "0xf2e743dddc09540227bdc111b66022310158ba6f67f941aeffe83d6ec0c4fa13",
+                    "nonce" : "0x9693bbb23b12ae0f",
+                    "number" : "0x01",
+                    "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
+                    "receiptTrie" : "0xc179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fa",
+                    "stateRoot" : "0x4e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe7bc843ec5e750fdfdc59b9b72ad4317dfca2bd7a817eac104dd0475b288ebf5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea0e7bc843ec5e750fdfdc59b9b72ad4317dfca2bd7a817eac104dd0475b288ebf5a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0f2e743dddc09540227bdc111b66022310158ba6f67f941aeffe83d6ec0c4fa13889693bbb23b12ae0ff882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000001ea601ca076dbf27177d8c577beefbbe13c86b656b9c478d49dd912f99999ede610ce5659a01ba504ebbeb5930a9b553778f174f6d2846d9fd5aa025c6f1ae5ed4859a94e2ec0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x76dbf27177d8c577beefbbe13c86b656b9c478d49dd912f99999ede610ce5659",
+                        "s" : "0x1ba504ebbeb5930a9b553778f174f6d2846d9fd5aa025c6f1ae5ed4859a94e2e",
+                        "to" : "0x3e180b1862f9d158abb5e519a6d8605540c23682",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x65473961f4b48599ca66b5d23fd850509b3891213888b51a6b93cff5f9f393ca",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d1g0v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d1g0v1.json
index be19bf098..fd1dd6376 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d1g0v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d1g0v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertDepthCreateAddressCollision_d1g0v1_EIP150" : {
+    "RevertDepthCreateAddressCollision_d1g0v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g0v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x16213dd0a93311488d5c236c28de8d0ccf058fc46e583f57c1584451f3b91d7d",
-                    "mixHash" : "0x358c3f5c088ffdf20cba30461480991d0bfa477d881a1c5c76a79eab61273c9d",
-                    "nonce" : "0x95ff694c5c4705f1",
+                    "hash" : "0xd8ca0dcf6b37862d492204773a7eb46db0773145c14a000b5c1dc7b79fb7790e",
+                    "mixHash" : "0xaa97e6eda034db96387a373be58ff648fc5c4631534033a987a1e780047f6cce",
+                    "nonce" : "0x3f21acfe6812bf55",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0xc179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fa",
-                    "stateRoot" : "0x4e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083e",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x5f014c1da847c7a2178e36135d6ff7cb2639d0eb6363e4e4e65a8d1c0dbc3bde",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x967957bb8deefa181c4ab2eb2c2b001ae896840b136e8f8af2a5ed4c46aa9563",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea0967957bb8deefa181c4ab2eb2c2b001ae896840b136e8f8af2a5ed4c46aa9563a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0358c3f5c088ffdf20cba30461480991d0bfa477d881a1c5c76a79eab61273c9d8895ff694c5c4705f1f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ca0e5c26ec1126035eff78cf67da7ec945022a925eb9db2ad0367a726314dc7e775a0795a6cdf8e39659503e04419d0a5bf64257be11813f4d60e36b51d9566c8602cc0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05f014c1da847c7a2178e36135d6ff7cb2639d0eb6363e4e4e65a8d1c0dbc3bdea0967957bb8deefa181c4ab2eb2c2b001ae896840b136e8f8af2a5ed4c46aa9563a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0aa97e6eda034db96387a373be58ff648fc5c4631534033a987a1e780047f6cce883f21acfe6812bf55f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ca0e5c26ec1126035eff78cf67da7ec945022a925eb9db2ad0367a726314dc7e775a0795a6cdf8e39659503e04419d0a5bf64257be11813f4d60e36b51d9566c8602cc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x16213dd0a93311488d5c236c28de8d0ccf058fc46e583f57c1584451f3b91d7d",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd8ca0dcf6b37862d492204773a7eb46db0773145c14a000b5c1dc7b79fb7790e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
                 "code" : "",
@@ -118,10 +125,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d1g0v1_EIP158" : {
+    "RevertDepthCreateAddressCollision_d1g0v1_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g0v1Filler.json"
         },
         "blocks" : [
@@ -133,18 +140,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x139cbeb9113d20799f4beafc53191225f420abc4c1a358cfaa0c8ca857be2cec",
-                    "mixHash" : "0xdecfaaa085e4b718e36fbf7c1cd8aeaed7b36617637456fae5fa3c63c606bf5c",
-                    "nonce" : "0x4c4b2259aabe9c09",
+                    "hash" : "0x292bec46acb07514d85dc54f9443473c347bb8e0ce9b0c7c78e41b44dfff51bc",
+                    "mixHash" : "0x730fad7c9d24cfebc132ca792c5bf4e0c140958a5361f57deb30ebe32860df68",
+                    "nonce" : "0x357af4d7ef943099",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0xc179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fa",
-                    "stateRoot" : "0x4e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083e",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x5f014c1da847c7a2178e36135d6ff7cb2639d0eb6363e4e4e65a8d1c0dbc3bde",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x967957bb8deefa181c4ab2eb2c2b001ae896840b136e8f8af2a5ed4c46aa9563",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea0967957bb8deefa181c4ab2eb2c2b001ae896840b136e8f8af2a5ed4c46aa9563a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0decfaaa085e4b718e36fbf7c1cd8aeaed7b36617637456fae5fa3c63c606bf5c884c4b2259aabe9c09f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ca0e5c26ec1126035eff78cf67da7ec945022a925eb9db2ad0367a726314dc7e775a0795a6cdf8e39659503e04419d0a5bf64257be11813f4d60e36b51d9566c8602cc0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05f014c1da847c7a2178e36135d6ff7cb2639d0eb6363e4e4e65a8d1c0dbc3bdea0967957bb8deefa181c4ab2eb2c2b001ae896840b136e8f8af2a5ed4c46aa9563a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0730fad7c9d24cfebc132ca792c5bf4e0c140958a5361f57deb30ebe32860df6888357af4d7ef943099f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ca0e5c26ec1126035eff78cf67da7ec945022a925eb9db2ad0367a726314dc7e775a0795a6cdf8e39659503e04419d0a5bf64257be11813f4d60e36b51d9566c8602cc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -181,9 +188,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x139cbeb9113d20799f4beafc53191225f420abc4c1a358cfaa0c8ca857be2cec",
-        "network" : "EIP158",
+        "lastblockhash" : "0x292bec46acb07514d85dc54f9443473c347bb8e0ce9b0c7c78e41b44dfff51bc",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
                 "code" : "",
@@ -237,10 +251,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d1g0v1_Frontier" : {
+    "RevertDepthCreateAddressCollision_d1g0v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g0v1Filler.json"
         },
         "blocks" : [
@@ -252,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x8bf0d0f51ea3a4a4ef0a534c4f0d5ddaf838426ba0a5a3c835d47f27602c34e0",
-                    "mixHash" : "0x7b8e1144357a0e9eeef5088f35eaa9d53356477f06c00a0d660112cba88d0551",
-                    "nonce" : "0x1ab3dcb92e9328d0",
+                    "hash" : "0xfe60a58239ea1ff3eba56c195ef4213a861a509d76bfe344ecbdc5c1b0795a42",
+                    "mixHash" : "0x30f5714a77d3425d894d09f3e291abbd3fa8e26e889c0aeecb4de3e21d379847",
+                    "nonce" : "0x47cfdbb416063486",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
                     "receiptTrie" : "0xc179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fa",
@@ -263,7 +277,7 @@
                     "transactionsTrie" : "0x967957bb8deefa181c4ab2eb2c2b001ae896840b136e8f8af2a5ed4c46aa9563",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea0967957bb8deefa181c4ab2eb2c2b001ae896840b136e8f8af2a5ed4c46aa9563a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a07b8e1144357a0e9eeef5088f35eaa9d53356477f06c00a0d660112cba88d0551881ab3dcb92e9328d0f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ca0e5c26ec1126035eff78cf67da7ec945022a925eb9db2ad0367a726314dc7e775a0795a6cdf8e39659503e04419d0a5bf64257be11813f4d60e36b51d9566c8602cc0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea0967957bb8deefa181c4ab2eb2c2b001ae896840b136e8f8af2a5ed4c46aa9563a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a030f5714a77d3425d894d09f3e291abbd3fa8e26e889c0aeecb4de3e21d3798478847cfdbb416063486f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ca0e5c26ec1126035eff78cf67da7ec945022a925eb9db2ad0367a726314dc7e775a0795a6cdf8e39659503e04419d0a5bf64257be11813f4d60e36b51d9566c8602cc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -300,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8bf0d0f51ea3a4a4ef0a534c4f0d5ddaf838426ba0a5a3c835d47f27602c34e0",
-        "network" : "Frontier",
+        "lastblockhash" : "0xfe60a58239ea1ff3eba56c195ef4213a861a509d76bfe344ecbdc5c1b0795a42",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
@@ -356,10 +370,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d1g0v1_Homestead" : {
+    "RevertDepthCreateAddressCollision_d1g0v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g0v1Filler.json"
         },
         "blocks" : [
@@ -371,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x2ab25c6837baff4465eaffaf2267016d561795897633a405898d8172a4740766",
-                    "mixHash" : "0x4b3316a2cb1c26db5a0bd3a9510cf2e0ee6915f6cd924f4eed3e2ce566fb8ebc",
-                    "nonce" : "0x0c1a5ab38adb5fb3",
+                    "hash" : "0x929dc92973a4b6a5d04448e8550342403470450daf551457e2cc83bc331366a1",
+                    "mixHash" : "0xd6b0d8d4a6093e862b407ae0c16d6678a71b3bdda723be77d3550322574d093d",
+                    "nonce" : "0x4b21eb634ef74e3e",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
                     "receiptTrie" : "0xc179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fa",
@@ -382,7 +396,7 @@
                     "transactionsTrie" : "0x967957bb8deefa181c4ab2eb2c2b001ae896840b136e8f8af2a5ed4c46aa9563",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea0967957bb8deefa181c4ab2eb2c2b001ae896840b136e8f8af2a5ed4c46aa9563a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a04b3316a2cb1c26db5a0bd3a9510cf2e0ee6915f6cd924f4eed3e2ce566fb8ebc880c1a5ab38adb5fb3f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ca0e5c26ec1126035eff78cf67da7ec945022a925eb9db2ad0367a726314dc7e775a0795a6cdf8e39659503e04419d0a5bf64257be11813f4d60e36b51d9566c8602cc0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea0967957bb8deefa181c4ab2eb2c2b001ae896840b136e8f8af2a5ed4c46aa9563a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0d6b0d8d4a6093e862b407ae0c16d6678a71b3bdda723be77d3550322574d093d884b21eb634ef74e3ef882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ca0e5c26ec1126035eff78cf67da7ec945022a925eb9db2ad0367a726314dc7e775a0795a6cdf8e39659503e04419d0a5bf64257be11813f4d60e36b51d9566c8602cc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -419,8 +433,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2ab25c6837baff4465eaffaf2267016d561795897633a405898d8172a4740766",
-        "network" : "Homestead",
+        "lastblockhash" : "0x929dc92973a4b6a5d04448e8550342403470450daf551457e2cc83bc331366a1",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
@@ -475,10 +489,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d1g0v1_Metropolis" : {
+    "RevertDepthCreateAddressCollision_d1g0v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g0v1Filler.json"
         },
         "blocks" : [
@@ -490,18 +504,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x7c32b0d6016608b3d12977429c2a42bee10c33dfe399e20776827ab3491a5907",
-                    "mixHash" : "0x97f0a3c3f09564db9b278b3f70309366fb256f979bc4352a699a1474b6977d21",
-                    "nonce" : "0xcf1ff552e14e6fbd",
+                    "hash" : "0xe3ca737719436d1470f26c4110c476ee9e4f21e0e49ce7cae86228b5fa87bf58",
+                    "mixHash" : "0xa09b8f8f3d704dcce34a735721cbda02b5013fa5ad476d788cb98463ff363f54",
+                    "nonce" : "0x80ed6b127cc82101",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
-                    "stateRoot" : "0x5f014c1da847c7a2178e36135d6ff7cb2639d0eb6363e4e4e65a8d1c0dbc3bde",
+                    "receiptTrie" : "0xc179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fa",
+                    "stateRoot" : "0x4e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x967957bb8deefa181c4ab2eb2c2b001ae896840b136e8f8af2a5ed4c46aa9563",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05f014c1da847c7a2178e36135d6ff7cb2639d0eb6363e4e4e65a8d1c0dbc3bdea0967957bb8deefa181c4ab2eb2c2b001ae896840b136e8f8af2a5ed4c46aa9563a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a097f0a3c3f09564db9b278b3f70309366fb256f979bc4352a699a1474b6977d2188cf1ff552e14e6fbdf882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ca0e5c26ec1126035eff78cf67da7ec945022a925eb9db2ad0367a726314dc7e775a0795a6cdf8e39659503e04419d0a5bf64257be11813f4d60e36b51d9566c8602cc0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea0967957bb8deefa181c4ab2eb2c2b001ae896840b136e8f8af2a5ed4c46aa9563a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0a09b8f8f3d704dcce34a735721cbda02b5013fa5ad476d788cb98463ff363f548880ed6b127cc82101f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ca0e5c26ec1126035eff78cf67da7ec945022a925eb9db2ad0367a726314dc7e775a0795a6cdf8e39659503e04419d0a5bf64257be11813f4d60e36b51d9566c8602cc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -538,16 +552,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7c32b0d6016608b3d12977429c2a42bee10c33dfe399e20776827ab3491a5907",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe3ca737719436d1470f26c4110c476ee9e4f21e0e49ce7cae86228b5fa87bf58",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5adb0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a36250",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertDepthCreateAddressCollision_d1g0v1_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g0v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x9907a846bb2881e9baa6916de0a9833af8cd5934195ed12a6db7259c4a0963fd",
+                    "mixHash" : "0xb02dc455ff129fe1346428c1918c86d534773f123a823d27de459e0f9d70dfb6",
+                    "nonce" : "0xc09c07345ecfac60",
+                    "number" : "0x01",
+                    "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
+                    "receiptTrie" : "0xc179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fa",
+                    "stateRoot" : "0x4e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x967957bb8deefa181c4ab2eb2c2b001ae896840b136e8f8af2a5ed4c46aa9563",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e6cbd7d8c4fefa307e3673433fdda8658227597cd2b8f1ab3928a6c9ada083ea0967957bb8deefa181c4ab2eb2c2b001ae896840b136e8f8af2a5ed4c46aa9563a0c179fe8c06cb1c853d90b238977038c12fd7db327848a009f85d13aa675e79fab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0b02dc455ff129fe1346428c1918c86d534773f123a823d27de459e0f9d70dfb688c09c07345ecfac60f882f88080018301adb0943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ca0e5c26ec1126035eff78cf67da7ec945022a925eb9db2ad0367a726314dc7e775a0795a6cdf8e39659503e04419d0a5bf64257be11813f4d60e36b51d9566c8602cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe5c26ec1126035eff78cf67da7ec945022a925eb9db2ad0367a726314dc7e775",
+                        "s" : "0x795a6cdf8e39659503e04419d0a5bf64257be11813f4d60e36b51d9566c8602c",
+                        "to" : "0x3e180b1862f9d158abb5e519a6d8605540c23682",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9907a846bb2881e9baa6916de0a9833af8cd5934195ed12a6db7259c4a0963fd",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d1g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d1g1v0.json
index 698618d57..41aad2a9e 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d1g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d1g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertDepthCreateAddressCollision_d1g1v0_EIP150" : {
+    "RevertDepthCreateAddressCollision_d1g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0259e2",
-                    "hash" : "0xded50be57e1a8223cc6449019c0692ec2aa4fa314be4e684a4e897b8450b9cea",
-                    "mixHash" : "0xc098b9c717cceb6d565c973b841ade5e4cba76d7bdccf9b06fab893e8219e05c",
-                    "nonce" : "0xbc0665e4f248eb1e",
+                    "hash" : "0x6d399a2e30dc669a2ed447a563688cc45ffd9cd99979e77d207db9debf709f0d",
+                    "mixHash" : "0x625d606ce090ed2e42f1914795625283360408cd3a028d242963493e8d16768d",
+                    "nonce" : "0xac3c67bae76e6ad1",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0x37ae2dd115d8d4331bd1456f20593f01f778d593ff7c45dc0fd0b1be92ec5115",
-                    "stateRoot" : "0x2592256e38d605f8f3f44f4d900f6cd61e9885b1fe7a48b6133f7a3b6f0e0781",
+                    "receiptTrie" : "0x1e4134e4cb2f1fe1fd6582225bcf81c6a06f48432112f70c794cc859d39fa735",
+                    "stateRoot" : "0x4b98f2b1e04022d6c2aab8f6ad19e7d7671796e5bb824150abc60b4cc04d9929",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2f362e699902bc53f045cc0acdf5b09dc25ac06e8d9bfc2c0af130d77168bfa4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02592256e38d605f8f3f44f4d900f6cd61e9885b1fe7a48b6133f7a3b6f0e0781a02f362e699902bc53f045cc0acdf5b09dc25ac06e8d9bfc2c0af130d77168bfa4a037ae2dd115d8d4331bd1456f20593f01f778d593ff7c45dc0fd0b1be92ec5115b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a0c098b9c717cceb6d565c973b841ade5e4cba76d7bdccf9b06fab893e8219e05c88bc0665e4f248eb1ef882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000001ea601ba0e3f617fdd29557d15cab35cb321895b4a29e8ceaa136c158fb77e1389e24fab2a043a990142025f15c12caade84225f324f863991818ca85f59c9696c09ac60dcbc0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b98f2b1e04022d6c2aab8f6ad19e7d7671796e5bb824150abc60b4cc04d9929a02f362e699902bc53f045cc0acdf5b09dc25ac06e8d9bfc2c0af130d77168bfa4a01e4134e4cb2f1fe1fd6582225bcf81c6a06f48432112f70c794cc859d39fa735b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a0625d606ce090ed2e42f1914795625283360408cd3a028d242963493e8d16768d88ac3c67bae76e6ad1f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000001ea601ba0e3f617fdd29557d15cab35cb321895b4a29e8ceaa136c158fb77e1389e24fab2a043a990142025f15c12caade84225f324f863991818ca85f59c9696c09ac60dcbc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xded50be57e1a8223cc6449019c0692ec2aa4fa314be4e684a4e897b8450b9cea",
-        "network" : "EIP150",
+        "lastblockhash" : "0x6d399a2e30dc669a2ed447a563688cc45ffd9cd99979e77d207db9debf709f0d",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f659e2",
                 "code" : "",
@@ -75,7 +82,7 @@
             "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
                 "balance" : "0x06",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x01",
                     "0x01" : "0x01",
@@ -123,10 +130,136 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d1g1v0_EIP158" : {
+    "RevertDepthCreateAddressCollision_d1g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x027100",
+                    "hash" : "0xe4a15218fa6e14cd66c71899bb06c9de1f9ab2886a3ac8108957a3c79441f055",
+                    "mixHash" : "0x263f9174d1d76c3f81dabd88896d605ca90b962c1d35c91840c6824cab3c8e7e",
+                    "nonce" : "0x426deb13d3d5260f",
+                    "number" : "0x01",
+                    "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
+                    "receiptTrie" : "0x3bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219c",
+                    "stateRoot" : "0xffeb08251366a71e3578d720b177d79646c7fb7fe199bbd9d9946d4c8f315c1d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2f362e699902bc53f045cc0acdf5b09dc25ac06e8d9bfc2c0af130d77168bfa4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffeb08251366a71e3578d720b177d79646c7fb7fe199bbd9d9946d4c8f315c1da02f362e699902bc53f045cc0acdf5b09dc25ac06e8d9bfc2c0af130d77168bfa4a03bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0263f9174d1d76c3f81dabd88896d605ca90b962c1d35c91840c6824cab3c8e7e88426deb13d3d5260ff882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000001ea601ba0e3f617fdd29557d15cab35cb321895b4a29e8ceaa136c158fb77e1389e24fab2a043a990142025f15c12caade84225f324f863991818ca85f59c9696c09ac60dcbc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
+                        "gasLimit" : "0x027100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe3f617fdd29557d15cab35cb321895b4a29e8ceaa136c158fb77e1389e24fab2",
+                        "s" : "0x43a990142025f15c12caade84225f324f863991818ca85f59c9696c09ac60dcb",
+                        "to" : "0x3e180b1862f9d158abb5e519a6d8605540c23682",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe4a15218fa6e14cd66c71899bb06c9de1f9ab2886a3ac8108957a3c79441f055",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f67100",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a29f00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertDepthCreateAddressCollision_d1g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -138,18 +271,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0259e2",
-                    "hash" : "0xc0d15a7d868ddf5168cb8ed39d25e57f853d22eac1045ed16dcccfafc826cd07",
-                    "mixHash" : "0x4a086e89ee9e5add0f24d0f00fbac79ff300f90c098bb9b3ca2c1a4a82b80a49",
-                    "nonce" : "0xacf3022f3b0bb240",
+                    "hash" : "0x6e8214cf2906dc6f6009f6e011d222f5b69247aab123d17f92b1520a366c26cb",
+                    "mixHash" : "0x5e2853a03701c284f49dd94bb58abdcc1ab9216285ad7e6f7bd494706502075d",
+                    "nonce" : "0x72788af04a23868e",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0x039b7032df4391e4b25cec42aa47f10efd474be047ec3b0fb3782d775f124be2",
-                    "stateRoot" : "0xa48426722ab53c927ffd3ba680be2907953010636648555963b53cafc818b359",
+                    "receiptTrie" : "0x37ae2dd115d8d4331bd1456f20593f01f778d593ff7c45dc0fd0b1be92ec5115",
+                    "stateRoot" : "0x2592256e38d605f8f3f44f4d900f6cd61e9885b1fe7a48b6133f7a3b6f0e0781",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2f362e699902bc53f045cc0acdf5b09dc25ac06e8d9bfc2c0af130d77168bfa4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a48426722ab53c927ffd3ba680be2907953010636648555963b53cafc818b359a02f362e699902bc53f045cc0acdf5b09dc25ac06e8d9bfc2c0af130d77168bfa4a0039b7032df4391e4b25cec42aa47f10efd474be047ec3b0fb3782d775f124be2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a04a086e89ee9e5add0f24d0f00fbac79ff300f90c098bb9b3ca2c1a4a82b80a4988acf3022f3b0bb240f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000001ea601ba0e3f617fdd29557d15cab35cb321895b4a29e8ceaa136c158fb77e1389e24fab2a043a990142025f15c12caade84225f324f863991818ca85f59c9696c09ac60dcbc0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02592256e38d605f8f3f44f4d900f6cd61e9885b1fe7a48b6133f7a3b6f0e0781a02f362e699902bc53f045cc0acdf5b09dc25ac06e8d9bfc2c0af130d77168bfa4a037ae2dd115d8d4331bd1456f20593f01f778d593ff7c45dc0fd0b1be92ec5115b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a05e2853a03701c284f49dd94bb58abdcc1ab9216285ad7e6f7bd494706502075d8872788af04a23868ef882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000001ea601ba0e3f617fdd29557d15cab35cb321895b4a29e8ceaa136c158fb77e1389e24fab2a043a990142025f15c12caade84225f324f863991818ca85f59c9696c09ac60dcbc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -186,8 +319,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc0d15a7d868ddf5168cb8ed39d25e57f853d22eac1045ed16dcccfafc826cd07",
-        "network" : "EIP158",
+        "lastblockhash" : "0x6e8214cf2906dc6f6009f6e011d222f5b69247aab123d17f92b1520a366c26cb",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f659e2",
@@ -199,7 +332,7 @@
             "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
                 "balance" : "0x06",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01",
                     "0x01" : "0x01",
@@ -247,10 +380,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d1g1v0_Frontier" : {
+    "RevertDepthCreateAddressCollision_d1g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -261,19 +394,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x027100",
-                    "hash" : "0xbb67279dc2c4249b53442b53beb095bbe3a60f4146ea38b506d53caed2bb3fb8",
-                    "mixHash" : "0xd34ad405d5c4f792ad659037b3379b7bce43ed5eb29997b3d1e256bbb3123d5a",
-                    "nonce" : "0xa822bd066f9452b3",
+                    "gasUsed" : "0x0259e2",
+                    "hash" : "0x4ced12446345ff6893c9e0e7c74a6b193ba4ed8c94969d12e71a02bb079a2e1c",
+                    "mixHash" : "0x9297e0420141f7e3f57e7b09a24dfbe0fc7dec47875726ed0bd30a30b9f74311",
+                    "nonce" : "0x14e82390b0d5f467",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0x15fe71b08b3ea2e14d93d0c2a02dee428df1a640aea7b9327846da01adb7a35c",
-                    "stateRoot" : "0x2201552f1c90ad6fc5fb24b2cece687695b6795c469d2305e9577e476721aa2e",
+                    "receiptTrie" : "0x039b7032df4391e4b25cec42aa47f10efd474be047ec3b0fb3782d775f124be2",
+                    "stateRoot" : "0xa48426722ab53c927ffd3ba680be2907953010636648555963b53cafc818b359",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2f362e699902bc53f045cc0acdf5b09dc25ac06e8d9bfc2c0af130d77168bfa4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02201552f1c90ad6fc5fb24b2cece687695b6795c469d2305e9577e476721aa2ea02f362e699902bc53f045cc0acdf5b09dc25ac06e8d9bfc2c0af130d77168bfa4a015fe71b08b3ea2e14d93d0c2a02dee428df1a640aea7b9327846da01adb7a35cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0d34ad405d5c4f792ad659037b3379b7bce43ed5eb29997b3d1e256bbb3123d5a88a822bd066f9452b3f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000001ea601ba0e3f617fdd29557d15cab35cb321895b4a29e8ceaa136c158fb77e1389e24fab2a043a990142025f15c12caade84225f324f863991818ca85f59c9696c09ac60dcbc0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a48426722ab53c927ffd3ba680be2907953010636648555963b53cafc818b359a02f362e699902bc53f045cc0acdf5b09dc25ac06e8d9bfc2c0af130d77168bfa4a0039b7032df4391e4b25cec42aa47f10efd474be047ec3b0fb3782d775f124be2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a09297e0420141f7e3f57e7b09a24dfbe0fc7dec47875726ed0bd30a30b9f743118814e82390b0d5f467f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000001ea601ba0e3f617fdd29557d15cab35cb321895b4a29e8ceaa136c158fb77e1389e24fab2a043a990142025f15c12caade84225f324f863991818ca85f59c9696c09ac60dcbc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -310,25 +443,28 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbb67279dc2c4249b53442b53beb095bbe3a60f4146ea38b506d53caed2bb3fb8",
-        "network" : "Frontier",
+        "lastblockhash" : "0x4ced12446345ff6893c9e0e7c74a6b193ba4ed8c94969d12e71a02bb079a2e1c",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f67100",
+                "balance" : "0x4563918244f659e2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
-                "balance" : "0x05",
-                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
-                "nonce" : "0x36",
+                "balance" : "0x06",
+                "code" : "",
+                "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x04" : "0x0c"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a29f00",
+                "balance" : "0xe8d4a2b61d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -337,8 +473,10 @@
             "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6008600255600060006000f050600c600355",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
+                    "0x02" : "0x08",
+                    "0x03" : "0x0c"
                 }
             }
         },
@@ -366,10 +504,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d1g1v0_Homestead" : {
+    "RevertDepthCreateAddressCollision_d1g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -381,9 +519,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0x8f5d79706d7e388beeb0b86cd268f51bcfca39d6641b81f0b50131591ed054aa",
-                    "mixHash" : "0x0a0a64fd053d5cfa6fe1673fb9dd3365b3fbbfc798a79476da726e1d01eea329",
-                    "nonce" : "0x4d560ae7280cd9df",
+                    "hash" : "0xe7f9f228d96a28ef3d15250f3c92c8231de76a4f6b631795f228456b9ec6a87c",
+                    "mixHash" : "0xdd68f2acf0a555947c5b9a4f53baa844b67b5fd280da96a19287713f2e3193d3",
+                    "nonce" : "0xfdce544b951262b3",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
                     "receiptTrie" : "0x15fe71b08b3ea2e14d93d0c2a02dee428df1a640aea7b9327846da01adb7a35c",
@@ -392,7 +530,7 @@
                     "transactionsTrie" : "0x2f362e699902bc53f045cc0acdf5b09dc25ac06e8d9bfc2c0af130d77168bfa4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02201552f1c90ad6fc5fb24b2cece687695b6795c469d2305e9577e476721aa2ea02f362e699902bc53f045cc0acdf5b09dc25ac06e8d9bfc2c0af130d77168bfa4a015fe71b08b3ea2e14d93d0c2a02dee428df1a640aea7b9327846da01adb7a35cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a00a0a64fd053d5cfa6fe1673fb9dd3365b3fbbfc798a79476da726e1d01eea329884d560ae7280cd9dff882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000001ea601ba0e3f617fdd29557d15cab35cb321895b4a29e8ceaa136c158fb77e1389e24fab2a043a990142025f15c12caade84225f324f863991818ca85f59c9696c09ac60dcbc0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02201552f1c90ad6fc5fb24b2cece687695b6795c469d2305e9577e476721aa2ea02f362e699902bc53f045cc0acdf5b09dc25ac06e8d9bfc2c0af130d77168bfa4a015fe71b08b3ea2e14d93d0c2a02dee428df1a640aea7b9327846da01adb7a35cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0dd68f2acf0a555947c5b9a4f53baa844b67b5fd280da96a19287713f2e3193d388fdce544b951262b3f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000001ea601ba0e3f617fdd29557d15cab35cb321895b4a29e8ceaa136c158fb77e1389e24fab2a043a990142025f15c12caade84225f324f863991818ca85f59c9696c09ac60dcbc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -429,8 +567,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8f5d79706d7e388beeb0b86cd268f51bcfca39d6641b81f0b50131591ed054aa",
-        "network" : "Homestead",
+        "lastblockhash" : "0xe7f9f228d96a28ef3d15250f3c92c8231de76a4f6b631795f228456b9ec6a87c",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f67100",
@@ -485,10 +623,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d1g1v0_Metropolis" : {
+    "RevertDepthCreateAddressCollision_d1g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -500,18 +638,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0x384d4d05fa99ca9de659a2c98ec7ae510dff39d28badec16b892701bfedc362e",
-                    "mixHash" : "0xaa2d0405e073c265bf86906ec192c944e679c2d8663153bfab15697310b069e4",
-                    "nonce" : "0xef190681ff98ef0c",
+                    "hash" : "0xd573de63af4fa990fd9e4c8e4ffe284044abf63c9c77ba39320f3364c51d25b3",
+                    "mixHash" : "0x18a0a8d0770e56b71db11959f2c8abf85fb705d8aa86b5046a1d867c98fdc1d2",
+                    "nonce" : "0xc52acd0fb74507f5",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0x3bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219c",
-                    "stateRoot" : "0xffeb08251366a71e3578d720b177d79646c7fb7fe199bbd9d9946d4c8f315c1d",
+                    "receiptTrie" : "0x15fe71b08b3ea2e14d93d0c2a02dee428df1a640aea7b9327846da01adb7a35c",
+                    "stateRoot" : "0x2201552f1c90ad6fc5fb24b2cece687695b6795c469d2305e9577e476721aa2e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2f362e699902bc53f045cc0acdf5b09dc25ac06e8d9bfc2c0af130d77168bfa4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffeb08251366a71e3578d720b177d79646c7fb7fe199bbd9d9946d4c8f315c1da02f362e699902bc53f045cc0acdf5b09dc25ac06e8d9bfc2c0af130d77168bfa4a03bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0aa2d0405e073c265bf86906ec192c944e679c2d8663153bfab15697310b069e488ef190681ff98ef0cf882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000001ea601ba0e3f617fdd29557d15cab35cb321895b4a29e8ceaa136c158fb77e1389e24fab2a043a990142025f15c12caade84225f324f863991818ca85f59c9696c09ac60dcbc0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02201552f1c90ad6fc5fb24b2cece687695b6795c469d2305e9577e476721aa2ea02f362e699902bc53f045cc0acdf5b09dc25ac06e8d9bfc2c0af130d77168bfa4a015fe71b08b3ea2e14d93d0c2a02dee428df1a640aea7b9327846da01adb7a35cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a018a0a8d0770e56b71db11959f2c8abf85fb705d8aa86b5046a1d867c98fdc1d288c52acd0fb74507f5f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368201a0000000000000000000000000000000000000000000000000000000000001ea601ba0e3f617fdd29557d15cab35cb321895b4a29e8ceaa136c158fb77e1389e24fab2a043a990142025f15c12caade84225f324f863991818ca85f59c9696c09ac60dcbc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -548,16 +686,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x384d4d05fa99ca9de659a2c98ec7ae510dff39d28badec16b892701bfedc362e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd573de63af4fa990fd9e4c8e4ffe284044abf63c9c77ba39320f3364c51d25b3",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f67100",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d1g1v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d1g1v1.json
index 80e2f92cb..a44a8499a 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d1g1v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision_d1g1v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertDepthCreateAddressCollision_d1g1v1_EIP150" : {
+    "RevertDepthCreateAddressCollision_d1g1v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g1v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0259e2",
-                    "hash" : "0x9f286af1bcd7d0f13858969093467912104bffcc4784152fad56ea00d3224876",
-                    "mixHash" : "0xba94c7cf4354342b5d524d4a5d4c42fbcc7f366ca02512f1a32462743e82bf4f",
-                    "nonce" : "0x355bb02bedfaab7c",
+                    "hash" : "0x254287396d43dc328558237894fbcb90ff9eea0d7b9e1ca9a4c6eb86e0f962d3",
+                    "mixHash" : "0x4315a96911a2d6e7c5a6e12345d0ceafb0a07e508e1a20b399f64fe6da3be241",
+                    "nonce" : "0x661979c18d1ada7b",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0xcaa386e164a742718b2e0dde3c3d25df8a312f7312a4052d517b36c227d45413",
-                    "stateRoot" : "0x3faadcf9da31b1fbdc111b32f182a93a26e789ef7bcdc6174e71f49abc52fe07",
+                    "receiptTrie" : "0x1e4134e4cb2f1fe1fd6582225bcf81c6a06f48432112f70c794cc859d39fa735",
+                    "stateRoot" : "0x181bef989bb62b9807be11927e5319211ed2b06ac676852dd176f80a902263e5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03faadcf9da31b1fbdc111b32f182a93a26e789ef7bcdc6174e71f49abc52fe07a00e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05a0caa386e164a742718b2e0dde3c3d25df8a312f7312a4052d517b36c227d45413b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a0ba94c7cf4354342b5d524d4a5d4c42fbcc7f366ca02512f1a32462743e82bf4f88355bb02bedfaab7cf882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ba017574001613876c0e925083d80855b78374e6b5f8217bb5959dd96bd4466e091a069a842dcb9d30c79e00ce65060b811dff320a368f828172bd829401129fb2532c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0181bef989bb62b9807be11927e5319211ed2b06ac676852dd176f80a902263e5a00e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05a01e4134e4cb2f1fe1fd6582225bcf81c6a06f48432112f70c794cc859d39fa735b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a04315a96911a2d6e7c5a6e12345d0ceafb0a07e508e1a20b399f64fe6da3be24188661979c18d1ada7bf882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ba017574001613876c0e925083d80855b78374e6b5f8217bb5959dd96bd4466e091a069a842dcb9d30c79e00ce65060b811dff320a368f828172bd829401129fb2532c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9f286af1bcd7d0f13858969093467912104bffcc4784152fad56ea00d3224876",
-        "network" : "EIP150",
+        "lastblockhash" : "0x254287396d43dc328558237894fbcb90ff9eea0d7b9e1ca9a4c6eb86e0f962d3",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f659e2",
                 "code" : "",
@@ -75,7 +82,7 @@
             "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
                 "balance" : "0x05",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x01",
                     "0x01" : "0x01",
@@ -123,10 +130,136 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d1g1v1_EIP158" : {
+    "RevertDepthCreateAddressCollision_d1g1v1_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g1v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x027100",
+                    "hash" : "0x5d206b2965b5a7ed9b3fa444add5f3ad8170556981243327dd25de8629202747",
+                    "mixHash" : "0x1cb38bf0dcc30ff048d78d4fe9b3b2c734ed8d8261cc1d6d88f332ac43c58fff",
+                    "nonce" : "0xdbe8a73ee2141cf7",
+                    "number" : "0x01",
+                    "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
+                    "receiptTrie" : "0x3bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219c",
+                    "stateRoot" : "0xffeb08251366a71e3578d720b177d79646c7fb7fe199bbd9d9946d4c8f315c1d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffeb08251366a71e3578d720b177d79646c7fb7fe199bbd9d9946d4c8f315c1da00e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05a03bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a01cb38bf0dcc30ff048d78d4fe9b3b2c734ed8d8261cc1d6d88f332ac43c58fff88dbe8a73ee2141cf7f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ba017574001613876c0e925083d80855b78374e6b5f8217bb5959dd96bd4466e091a069a842dcb9d30c79e00ce65060b811dff320a368f828172bd829401129fb2532c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
+                        "gasLimit" : "0x027100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x17574001613876c0e925083d80855b78374e6b5f8217bb5959dd96bd4466e091",
+                        "s" : "0x69a842dcb9d30c79e00ce65060b811dff320a368f828172bd829401129fb2532",
+                        "to" : "0x3e180b1862f9d158abb5e519a6d8605540c23682",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5d206b2965b5a7ed9b3fa444add5f3ad8170556981243327dd25de8629202747",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f67100",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a29f00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertDepthCreateAddressCollision_d1g1v1_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g1v1Filler.json"
         },
         "blocks" : [
@@ -138,18 +271,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0259e2",
-                    "hash" : "0x5cb885131d5a26e3f62851befa7ec989d025be5109882b93b47992948f70a673",
-                    "mixHash" : "0x0b2938cb2af6fac2c8058e8ec938a256481b246470704118b8e141f8cc88952d",
-                    "nonce" : "0x9b8e8ba3c9ab6e91",
+                    "hash" : "0x298deb5bbfdd8581cf5c02442d466575f6984e7894377ee0d6a699a61c30c969",
+                    "mixHash" : "0x6354e5b6c4f2266baa0adba124eaf7236c9df1a63a3ba54e440b833a74de0aa4",
+                    "nonce" : "0xca4ef28e0ad05975",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0xa68faeda5ef38b20e4986f6bc36f247821056c593305146db8f38eb8f14835b8",
-                    "stateRoot" : "0x401704a459a1827078b864e919d1e53a59cfd293874885ca203e6c687db637f2",
+                    "receiptTrie" : "0xcaa386e164a742718b2e0dde3c3d25df8a312f7312a4052d517b36c227d45413",
+                    "stateRoot" : "0x3faadcf9da31b1fbdc111b32f182a93a26e789ef7bcdc6174e71f49abc52fe07",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0401704a459a1827078b864e919d1e53a59cfd293874885ca203e6c687db637f2a00e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05a0a68faeda5ef38b20e4986f6bc36f247821056c593305146db8f38eb8f14835b8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a00b2938cb2af6fac2c8058e8ec938a256481b246470704118b8e141f8cc88952d889b8e8ba3c9ab6e91f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ba017574001613876c0e925083d80855b78374e6b5f8217bb5959dd96bd4466e091a069a842dcb9d30c79e00ce65060b811dff320a368f828172bd829401129fb2532c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03faadcf9da31b1fbdc111b32f182a93a26e789ef7bcdc6174e71f49abc52fe07a00e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05a0caa386e164a742718b2e0dde3c3d25df8a312f7312a4052d517b36c227d45413b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a06354e5b6c4f2266baa0adba124eaf7236c9df1a63a3ba54e440b833a74de0aa488ca4ef28e0ad05975f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ba017574001613876c0e925083d80855b78374e6b5f8217bb5959dd96bd4466e091a069a842dcb9d30c79e00ce65060b811dff320a368f828172bd829401129fb2532c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -186,8 +319,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5cb885131d5a26e3f62851befa7ec989d025be5109882b93b47992948f70a673",
-        "network" : "EIP158",
+        "lastblockhash" : "0x298deb5bbfdd8581cf5c02442d466575f6984e7894377ee0d6a699a61c30c969",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f659e2",
@@ -199,7 +332,7 @@
             "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
                 "balance" : "0x05",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01",
                     "0x01" : "0x01",
@@ -247,10 +380,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d1g1v1_Frontier" : {
+    "RevertDepthCreateAddressCollision_d1g1v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g1v1Filler.json"
         },
         "blocks" : [
@@ -261,19 +394,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x027100",
-                    "hash" : "0x4f43995f5e763506b9cda818ba6f1822ba02cbd969e4d249da8800282b15da43",
-                    "mixHash" : "0x978f600bd84f7c214478a92ee255a5a548bfc7ac5b283e8fb2cced829cb7a0bf",
-                    "nonce" : "0xb045baf8d1003ef9",
+                    "gasUsed" : "0x0259e2",
+                    "hash" : "0x2cc40314604de47844e1c19c33eb6608c34c4e2940b97e528029ce45ead48e8f",
+                    "mixHash" : "0x142acaae5ce22c511a818d4e5abaaa6b48ba159a7bf6f60f8cf90282a1350b2d",
+                    "nonce" : "0xfe0ef951c1054a91",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0x15fe71b08b3ea2e14d93d0c2a02dee428df1a640aea7b9327846da01adb7a35c",
-                    "stateRoot" : "0x2201552f1c90ad6fc5fb24b2cece687695b6795c469d2305e9577e476721aa2e",
+                    "receiptTrie" : "0xa68faeda5ef38b20e4986f6bc36f247821056c593305146db8f38eb8f14835b8",
+                    "stateRoot" : "0x401704a459a1827078b864e919d1e53a59cfd293874885ca203e6c687db637f2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02201552f1c90ad6fc5fb24b2cece687695b6795c469d2305e9577e476721aa2ea00e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05a015fe71b08b3ea2e14d93d0c2a02dee428df1a640aea7b9327846da01adb7a35cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0978f600bd84f7c214478a92ee255a5a548bfc7ac5b283e8fb2cced829cb7a0bf88b045baf8d1003ef9f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ba017574001613876c0e925083d80855b78374e6b5f8217bb5959dd96bd4466e091a069a842dcb9d30c79e00ce65060b811dff320a368f828172bd829401129fb2532c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0401704a459a1827078b864e919d1e53a59cfd293874885ca203e6c687db637f2a00e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05a0a68faeda5ef38b20e4986f6bc36f247821056c593305146db8f38eb8f14835b8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a0142acaae5ce22c511a818d4e5abaaa6b48ba159a7bf6f60f8cf90282a1350b2d88fe0ef951c1054a91f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ba017574001613876c0e925083d80855b78374e6b5f8217bb5959dd96bd4466e091a069a842dcb9d30c79e00ce65060b811dff320a368f828172bd829401129fb2532c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -310,11 +443,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4f43995f5e763506b9cda818ba6f1822ba02cbd969e4d249da8800282b15da43",
-        "network" : "Frontier",
+        "lastblockhash" : "0x2cc40314604de47844e1c19c33eb6608c34c4e2940b97e528029ce45ead48e8f",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f67100",
+                "balance" : "0x4563918244f659e2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -322,13 +455,16 @@
             },
             "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
                 "balance" : "0x05",
-                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
-                "nonce" : "0x36",
+                "code" : "",
+                "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x04" : "0x0c"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a29f00",
+                "balance" : "0xe8d4a2b61e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -337,8 +473,10 @@
             "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6008600255600060006000f050600c600355",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
+                    "0x02" : "0x08",
+                    "0x03" : "0x0c"
                 }
             }
         },
@@ -366,10 +504,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d1g1v1_Homestead" : {
+    "RevertDepthCreateAddressCollision_d1g1v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g1v1Filler.json"
         },
         "blocks" : [
@@ -381,9 +519,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0x24d62c1466c93a70d6e1c76fcae7693aaec587386abf02a2bdea3645688a8d4b",
-                    "mixHash" : "0xc54fb98b64aafefa0db3d1243005f1ad1108f55146588c14ab82b05d28f47c62",
-                    "nonce" : "0xda9d4adb8f0f9cc2",
+                    "hash" : "0x6a90949237d90fef9a0223d2ca8044887e427cf7f686ed3e468961605e9f648f",
+                    "mixHash" : "0xdc7755ecf847d3b602306a1b9c74787a295af56e5674720fabb79e2461fd16ce",
+                    "nonce" : "0x2a294d1f1b076011",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
                     "receiptTrie" : "0x15fe71b08b3ea2e14d93d0c2a02dee428df1a640aea7b9327846da01adb7a35c",
@@ -392,7 +530,7 @@
                     "transactionsTrie" : "0x0e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02201552f1c90ad6fc5fb24b2cece687695b6795c469d2305e9577e476721aa2ea00e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05a015fe71b08b3ea2e14d93d0c2a02dee428df1a640aea7b9327846da01adb7a35cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0c54fb98b64aafefa0db3d1243005f1ad1108f55146588c14ab82b05d28f47c6288da9d4adb8f0f9cc2f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ba017574001613876c0e925083d80855b78374e6b5f8217bb5959dd96bd4466e091a069a842dcb9d30c79e00ce65060b811dff320a368f828172bd829401129fb2532c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02201552f1c90ad6fc5fb24b2cece687695b6795c469d2305e9577e476721aa2ea00e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05a015fe71b08b3ea2e14d93d0c2a02dee428df1a640aea7b9327846da01adb7a35cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0dc7755ecf847d3b602306a1b9c74787a295af56e5674720fabb79e2461fd16ce882a294d1f1b076011f882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ba017574001613876c0e925083d80855b78374e6b5f8217bb5959dd96bd4466e091a069a842dcb9d30c79e00ce65060b811dff320a368f828172bd829401129fb2532c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -429,8 +567,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x24d62c1466c93a70d6e1c76fcae7693aaec587386abf02a2bdea3645688a8d4b",
-        "network" : "Homestead",
+        "lastblockhash" : "0x6a90949237d90fef9a0223d2ca8044887e427cf7f686ed3e468961605e9f648f",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f67100",
@@ -485,10 +623,10 @@
             }
         }
     },
-    "RevertDepthCreateAddressCollision_d1g1v1_Metropolis" : {
+    "RevertDepthCreateAddressCollision_d1g1v1_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateAddressCollision_d1g1v1Filler.json"
         },
         "blocks" : [
@@ -500,18 +638,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0xfab463d3311762d640a617ecba2d678a3276da841f664544f1fd0084cb4ea37f",
-                    "mixHash" : "0x56b69f60a8a9b21973e6862546aff03fc516f885bcf5a1f79ac6f896a78c2a99",
-                    "nonce" : "0x5be788e55148e6bc",
+                    "hash" : "0x017affa896fdbfbeac6d04bd0ab521f8daa8e40adf66729ed47ed879c2f53035",
+                    "mixHash" : "0x91817ed9ac7bcaee5a2269cedd4f092eb6a31ee144f161c774ed4f08fe2cf548",
+                    "nonce" : "0x4155562784cda34d",
                     "number" : "0x01",
                     "parentHash" : "0x93dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427",
-                    "receiptTrie" : "0x3bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219c",
-                    "stateRoot" : "0xffeb08251366a71e3578d720b177d79646c7fb7fe199bbd9d9946d4c8f315c1d",
+                    "receiptTrie" : "0x15fe71b08b3ea2e14d93d0c2a02dee428df1a640aea7b9327846da01adb7a35c",
+                    "stateRoot" : "0x2201552f1c90ad6fc5fb24b2cece687695b6795c469d2305e9577e476721aa2e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffeb08251366a71e3578d720b177d79646c7fb7fe199bbd9d9946d4c8f315c1da00e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05a03bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a056b69f60a8a9b21973e6862546aff03fc516f885bcf5a1f79ac6f896a78c2a99885be788e55148e6bcf882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ba017574001613876c0e925083d80855b78374e6b5f8217bb5959dd96bd4466e091a069a842dcb9d30c79e00ce65060b811dff320a368f828172bd829401129fb2532c0",
+                "rlp" : "0xf90280f901f8a093dcf85bc7a76227f7e21e4ea5f868b5fe35b40c9bacc70d21636b4aea2c8427a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02201552f1c90ad6fc5fb24b2cece687695b6795c469d2305e9577e476721aa2ea00e799ab5e387b8e4f03c10df5ceb682eb01c2672ae2371c7461014eecd808f05a015fe71b08b3ea2e14d93d0c2a02dee428df1a640aea7b9327846da01adb7a35cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a091817ed9ac7bcaee5a2269cedd4f092eb6a31ee144f161c774ed4f08fe2cf548884155562784cda34df882f880800183027100943e180b1862f9d158abb5e519a6d8605540c2368280a0000000000000000000000000000000000000000000000000000000000001ea601ba017574001613876c0e925083d80855b78374e6b5f8217bb5959dd96bd4466e091a069a842dcb9d30c79e00ce65060b811dff320a368f828172bd829401129fb2532c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -548,16 +686,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02021386d37ea74464f53e382b6525956b68259567a65fab0e9021c9d25a86cf3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfab463d3311762d640a617ecba2d678a3276da841f664544f1fd0084cb4ea37f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x017affa896fdbfbeac6d04bd0ab521f8daa8e40adf66729ed47ed879c2f53035",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f67100",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d0g0v0.json
index f23ba9ba7..77c7c3c4a 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertDepthCreateOOG_d0g0v0_EIP150" : {
+    "RevertDepthCreateOOG_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/stRevertTest/RevertDepthCreateOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x0769e1bec9a6a5bbb0e89c7dc54366bc9cbbf90dd4109889304eb54cd2539923",
-                    "mixHash" : "0xe839621a70a0712aa02576dcd446e6d29b89071056005869f589674ff81fb887",
-                    "nonce" : "0x83a17bbdc2d6733d",
+                    "hash" : "0xeda411263ca1ff091ad68c310ba0ee3ecd70958f588da7ff1ae29a6857b231dd",
+                    "mixHash" : "0x2defb13878e4f418d84b897785a3a83c1914f9923a7766a39c1a7ff5003d5dac",
+                    "nonce" : "0x777028a6d5733134",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0x6338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52",
-                    "stateRoot" : "0xb29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x6ebaaecf252168ea0f4f85a5c67904afc2544cff61141a4a289b23749e79eeb4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa27d20d52606ec04b6404dfa1d077af8ce2f11574106d7b76fbcad7c2d72c134",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a0a27d20d52606ec04b6404dfa1d077af8ce2f11574106d7b76fbcad7c2d72c134a06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0e839621a70a0712aa02576dcd446e6d29b89071056005869f589674ff81fb8878883a17bbdc2d6733df882f88080018301adb094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000ea601ba0c09f0930b3eeb8be40c225e41b5ea10e44ed709ceb369cd6575024772a0f5de4a07272d8cf7a2095e0970779159a518c3977a812e449b913421f2455421b40ada1c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ebaaecf252168ea0f4f85a5c67904afc2544cff61141a4a289b23749e79eeb4a0a27d20d52606ec04b6404dfa1d077af8ce2f11574106d7b76fbcad7c2d72c134a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a02defb13878e4f418d84b897785a3a83c1914f9923a7766a39c1a7ff5003d5dac88777028a6d5733134f882f88080018301adb094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000ea601ba0c09f0930b3eeb8be40c225e41b5ea10e44ed709ceb369cd6575024772a0f5de4a07272d8cf7a2095e0970779159a518c3977a812e449b913421f2455421b40ada1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0769e1bec9a6a5bbb0e89c7dc54366bc9cbbf90dd4109889304eb54cd2539923",
-        "network" : "EIP150",
+        "lastblockhash" : "0xeda411263ca1ff091ad68c310ba0ee3ecd70958f588da7ff1ae29a6857b231dd",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
                 "code" : "",
@@ -118,10 +125,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d0g0v0_EIP158" : {
+    "RevertDepthCreateOOG_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/stRevertTest/RevertDepthCreateOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -133,18 +140,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x82ccad8e85facef445bccf07b749d19d2228150bb55c87e5d337e6831f056fd6",
-                    "mixHash" : "0xbf158ee82e628723f8487ac3ac0c2f1df17a91ac9039fc3fc3ce82be90acb2a3",
-                    "nonce" : "0x865582085fb798e8",
+                    "hash" : "0x03267290ad9d4ada480f8a0dfda8b5bb56efe39e9f9a912bc54f95e156d687c4",
+                    "mixHash" : "0xe9320ddaf149fa4ccd277862a78bfdbb4e09c4a3fbd2cac560632aa28739df96",
+                    "nonce" : "0xdd0fd3dfe4c1b056",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0x6338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52",
-                    "stateRoot" : "0xb29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x6ebaaecf252168ea0f4f85a5c67904afc2544cff61141a4a289b23749e79eeb4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa27d20d52606ec04b6404dfa1d077af8ce2f11574106d7b76fbcad7c2d72c134",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a0a27d20d52606ec04b6404dfa1d077af8ce2f11574106d7b76fbcad7c2d72c134a06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0bf158ee82e628723f8487ac3ac0c2f1df17a91ac9039fc3fc3ce82be90acb2a388865582085fb798e8f882f88080018301adb094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000ea601ba0c09f0930b3eeb8be40c225e41b5ea10e44ed709ceb369cd6575024772a0f5de4a07272d8cf7a2095e0970779159a518c3977a812e449b913421f2455421b40ada1c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ebaaecf252168ea0f4f85a5c67904afc2544cff61141a4a289b23749e79eeb4a0a27d20d52606ec04b6404dfa1d077af8ce2f11574106d7b76fbcad7c2d72c134a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0e9320ddaf149fa4ccd277862a78bfdbb4e09c4a3fbd2cac560632aa28739df9688dd0fd3dfe4c1b056f882f88080018301adb094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000ea601ba0c09f0930b3eeb8be40c225e41b5ea10e44ed709ceb369cd6575024772a0f5de4a07272d8cf7a2095e0970779159a518c3977a812e449b913421f2455421b40ada1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -181,9 +188,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x82ccad8e85facef445bccf07b749d19d2228150bb55c87e5d337e6831f056fd6",
-        "network" : "EIP158",
+        "lastblockhash" : "0x03267290ad9d4ada480f8a0dfda8b5bb56efe39e9f9a912bc54f95e156d687c4",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
                 "code" : "",
@@ -237,10 +251,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d0g0v0_Frontier" : {
+    "RevertDepthCreateOOG_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/stRevertTest/RevertDepthCreateOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -252,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0xbc0039911194a286b25a9f9c36f57288fe4736a2fa9d88e63478d5cfd966ea0c",
-                    "mixHash" : "0xf46bc128bbac058139607a169921f20fa9b5d646a505b3ca2ea7a0acbee9f1c9",
-                    "nonce" : "0x35c949bb5a0e8a5d",
+                    "hash" : "0xc3b09ce46ec994a3300eb0cc2262ac0b05618259e6470428fc341075c1bd7bc4",
+                    "mixHash" : "0x12f91b6d6ad24b05430190995ce7d7e9b4c5a8a8abbcf4411e23ad60087f77b3",
+                    "nonce" : "0x8693a02d9e3e59a3",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
                     "receiptTrie" : "0x6338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52",
@@ -263,7 +277,7 @@
                     "transactionsTrie" : "0xa27d20d52606ec04b6404dfa1d077af8ce2f11574106d7b76fbcad7c2d72c134",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a0a27d20d52606ec04b6404dfa1d077af8ce2f11574106d7b76fbcad7c2d72c134a06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0f46bc128bbac058139607a169921f20fa9b5d646a505b3ca2ea7a0acbee9f1c98835c949bb5a0e8a5df882f88080018301adb094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000ea601ba0c09f0930b3eeb8be40c225e41b5ea10e44ed709ceb369cd6575024772a0f5de4a07272d8cf7a2095e0970779159a518c3977a812e449b913421f2455421b40ada1c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a0a27d20d52606ec04b6404dfa1d077af8ce2f11574106d7b76fbcad7c2d72c134a06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a012f91b6d6ad24b05430190995ce7d7e9b4c5a8a8abbcf4411e23ad60087f77b3888693a02d9e3e59a3f882f88080018301adb094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000ea601ba0c09f0930b3eeb8be40c225e41b5ea10e44ed709ceb369cd6575024772a0f5de4a07272d8cf7a2095e0970779159a518c3977a812e449b913421f2455421b40ada1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -300,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbc0039911194a286b25a9f9c36f57288fe4736a2fa9d88e63478d5cfd966ea0c",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc3b09ce46ec994a3300eb0cc2262ac0b05618259e6470428fc341075c1bd7bc4",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
@@ -356,10 +370,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d0g0v0_Homestead" : {
+    "RevertDepthCreateOOG_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/stRevertTest/RevertDepthCreateOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -371,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x1e6380ede86cc3a1f0a4bdd80e5844a5d55c6a72c082afb391d459b79bf3893a",
-                    "mixHash" : "0x78142c4e6cc7eb76d220bca4e4acc52a4f230441709c7179f04dd7d85ec71d02",
-                    "nonce" : "0xd8061a4c4f9dc48a",
+                    "hash" : "0x6e4bce77679ca1f7d58378a65272b75d016bf34ad2d426d01011b825a0b869d5",
+                    "mixHash" : "0x3349653cdd288281802c1f9757dc98552ffc312a7278cbc93c2ebeee4596908e",
+                    "nonce" : "0xcfa80ae1707d3926",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
                     "receiptTrie" : "0x6338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52",
@@ -382,7 +396,7 @@
                     "transactionsTrie" : "0xa27d20d52606ec04b6404dfa1d077af8ce2f11574106d7b76fbcad7c2d72c134",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a0a27d20d52606ec04b6404dfa1d077af8ce2f11574106d7b76fbcad7c2d72c134a06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a078142c4e6cc7eb76d220bca4e4acc52a4f230441709c7179f04dd7d85ec71d0288d8061a4c4f9dc48af882f88080018301adb094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000ea601ba0c09f0930b3eeb8be40c225e41b5ea10e44ed709ceb369cd6575024772a0f5de4a07272d8cf7a2095e0970779159a518c3977a812e449b913421f2455421b40ada1c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a0a27d20d52606ec04b6404dfa1d077af8ce2f11574106d7b76fbcad7c2d72c134a06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a03349653cdd288281802c1f9757dc98552ffc312a7278cbc93c2ebeee4596908e88cfa80ae1707d3926f882f88080018301adb094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000ea601ba0c09f0930b3eeb8be40c225e41b5ea10e44ed709ceb369cd6575024772a0f5de4a07272d8cf7a2095e0970779159a518c3977a812e449b913421f2455421b40ada1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -419,8 +433,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1e6380ede86cc3a1f0a4bdd80e5844a5d55c6a72c082afb391d459b79bf3893a",
-        "network" : "Homestead",
+        "lastblockhash" : "0x6e4bce77679ca1f7d58378a65272b75d016bf34ad2d426d01011b825a0b869d5",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
@@ -475,10 +489,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d0g0v0_Metropolis" : {
+    "RevertDepthCreateOOG_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/stRevertTest/RevertDepthCreateOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -490,18 +504,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x3f78649234832df28fea474b84e9e7b42814bca52772c65e21f58033ceebd6ce",
-                    "mixHash" : "0xdeeebafb349c6893c97f61f45d6afcd4f8a753d9046bcb2a048b3520ecf607a7",
-                    "nonce" : "0x6517b3ee2010e5d5",
+                    "hash" : "0x2620b35836c05ad3a9bf7862f00f902dc1b164d549cd4c8f5f977353a2700efc",
+                    "mixHash" : "0x7a48b703e9ecc23791bac46e8570c55007fb5894151d5eca191ad2d1c9323873",
+                    "nonce" : "0xc2aec88d62443cf8",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
-                    "stateRoot" : "0x6ebaaecf252168ea0f4f85a5c67904afc2544cff61141a4a289b23749e79eeb4",
+                    "receiptTrie" : "0x6338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52",
+                    "stateRoot" : "0xb29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa27d20d52606ec04b6404dfa1d077af8ce2f11574106d7b76fbcad7c2d72c134",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ebaaecf252168ea0f4f85a5c67904afc2544cff61141a4a289b23749e79eeb4a0a27d20d52606ec04b6404dfa1d077af8ce2f11574106d7b76fbcad7c2d72c134a0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0deeebafb349c6893c97f61f45d6afcd4f8a753d9046bcb2a048b3520ecf607a7886517b3ee2010e5d5f882f88080018301adb094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000ea601ba0c09f0930b3eeb8be40c225e41b5ea10e44ed709ceb369cd6575024772a0f5de4a07272d8cf7a2095e0970779159a518c3977a812e449b913421f2455421b40ada1c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a0a27d20d52606ec04b6404dfa1d077af8ce2f11574106d7b76fbcad7c2d72c134a06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a07a48b703e9ecc23791bac46e8570c55007fb5894151d5eca191ad2d1c932387388c2aec88d62443cf8f882f88080018301adb094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000ea601ba0c09f0930b3eeb8be40c225e41b5ea10e44ed709ceb369cd6575024772a0f5de4a07272d8cf7a2095e0970779159a518c3977a812e449b913421f2455421b40ada1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -538,16 +552,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3f78649234832df28fea474b84e9e7b42814bca52772c65e21f58033ceebd6ce",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x2620b35836c05ad3a9bf7862f00f902dc1b164d549cd4c8f5f977353a2700efc",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5adb0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a36250",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertDepthCreateOOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x18728e264a2a32ae46f8b0f70358f4265ef4f296d67aeb412a6e315ae952e17a",
+                    "mixHash" : "0x73adb08c102980fad3e91633f85082643540b1e345a3c031eab7dfe7ddd3d6c4",
+                    "nonce" : "0x6cccd53e776636c0",
+                    "number" : "0x01",
+                    "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
+                    "receiptTrie" : "0x6338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52",
+                    "stateRoot" : "0xb29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa27d20d52606ec04b6404dfa1d077af8ce2f11574106d7b76fbcad7c2d72c134",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a0a27d20d52606ec04b6404dfa1d077af8ce2f11574106d7b76fbcad7c2d72c134a06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a073adb08c102980fad3e91633f85082643540b1e345a3c031eab7dfe7ddd3d6c4886cccd53e776636c0f882f88080018301adb094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000ea601ba0c09f0930b3eeb8be40c225e41b5ea10e44ed709ceb369cd6575024772a0f5de4a07272d8cf7a2095e0970779159a518c3977a812e449b913421f2455421b40ada1c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc09f0930b3eeb8be40c225e41b5ea10e44ed709ceb369cd6575024772a0f5de4",
+                        "s" : "0x7272d8cf7a2095e0970779159a518c3977a812e449b913421f2455421b40ada1",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x18728e264a2a32ae46f8b0f70358f4265ef4f296d67aeb412a6e315ae952e17a",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d0g0v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d0g0v1.json
index 4dc1b8c3f..651e74fe1 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d0g0v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d0g0v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertDepthCreateOOG_d0g0v1_EIP150" : {
+    "RevertDepthCreateOOG_d0g0v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0xd9c5e437cf2406da133c70041ef63358dba0facf2e8cd6017d322b2258318c43",
-                    "mixHash" : "0x9950237b98a28a20c63f2ae094b361791f4570b591bb086410763da5bb8cbf71",
-                    "nonce" : "0x3f2b189c15606ae5",
+                    "hash" : "0x0321f8a1055582bc1d206c5a84bdb81ef4526423a67a6fb5b32ac95690569435",
+                    "mixHash" : "0x0362c0438690b3125f28cf843b69ca1f975c339a4fdde9573b471d07856c87d3",
+                    "nonce" : "0x63140e2787bffd05",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0x6338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52",
-                    "stateRoot" : "0xb29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x6ebaaecf252168ea0f4f85a5c67904afc2544cff61141a4a289b23749e79eeb4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4a4a5f5ed4b30043d4bc005d7c233207f8b35e9f93e28fa7b78a27822f1bb3ee",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a04a4a5f5ed4b30043d4bc005d7c233207f8b35e9f93e28fa7b78a27822f1bb3eea06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a09950237b98a28a20c63f2ae094b361791f4570b591bb086410763da5bb8cbf71883f2b189c15606ae5f882f88080018301adb094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ca06eea972a7a8069ae1b6154b059125ea8b04f4304eeb688c9fb2446e5685187dea07dfb3835a8e0eb0454e8aa2a5c9e8d5aad18a0149b0aeae9b34132b542ac00e2c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ebaaecf252168ea0f4f85a5c67904afc2544cff61141a4a289b23749e79eeb4a04a4a5f5ed4b30043d4bc005d7c233207f8b35e9f93e28fa7b78a27822f1bb3eea0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a00362c0438690b3125f28cf843b69ca1f975c339a4fdde9573b471d07856c87d38863140e2787bffd05f882f88080018301adb094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ca06eea972a7a8069ae1b6154b059125ea8b04f4304eeb688c9fb2446e5685187dea07dfb3835a8e0eb0454e8aa2a5c9e8d5aad18a0149b0aeae9b34132b542ac00e2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd9c5e437cf2406da133c70041ef63358dba0facf2e8cd6017d322b2258318c43",
-        "network" : "EIP150",
+        "lastblockhash" : "0x0321f8a1055582bc1d206c5a84bdb81ef4526423a67a6fb5b32ac95690569435",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
                 "code" : "",
@@ -118,10 +125,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d0g0v1_EIP158" : {
+    "RevertDepthCreateOOG_d0g0v1_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -133,18 +140,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x439e44478dce3a003227f5354bae5ab1e0a10e3c97055fa5048d774127780486",
-                    "mixHash" : "0x561efac7ec40f09db52cc7cdf507f16dc10f3429210ee2eca984ac89c5cfd0e3",
-                    "nonce" : "0xb24dcd70e8588895",
+                    "hash" : "0x7d94d597e5ab30d88f312b11d1c1002ceb60ffa03bdcc639fd224586867f555d",
+                    "mixHash" : "0x7054c92d4d7e9649df875cc47dae26efcede2783bc0ca60a86393934e3a1d46b",
+                    "nonce" : "0x87ec616310d86b7a",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0x6338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52",
-                    "stateRoot" : "0xb29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x6ebaaecf252168ea0f4f85a5c67904afc2544cff61141a4a289b23749e79eeb4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4a4a5f5ed4b30043d4bc005d7c233207f8b35e9f93e28fa7b78a27822f1bb3ee",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a04a4a5f5ed4b30043d4bc005d7c233207f8b35e9f93e28fa7b78a27822f1bb3eea06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0561efac7ec40f09db52cc7cdf507f16dc10f3429210ee2eca984ac89c5cfd0e388b24dcd70e8588895f882f88080018301adb094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ca06eea972a7a8069ae1b6154b059125ea8b04f4304eeb688c9fb2446e5685187dea07dfb3835a8e0eb0454e8aa2a5c9e8d5aad18a0149b0aeae9b34132b542ac00e2c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ebaaecf252168ea0f4f85a5c67904afc2544cff61141a4a289b23749e79eeb4a04a4a5f5ed4b30043d4bc005d7c233207f8b35e9f93e28fa7b78a27822f1bb3eea0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a07054c92d4d7e9649df875cc47dae26efcede2783bc0ca60a86393934e3a1d46b8887ec616310d86b7af882f88080018301adb094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ca06eea972a7a8069ae1b6154b059125ea8b04f4304eeb688c9fb2446e5685187dea07dfb3835a8e0eb0454e8aa2a5c9e8d5aad18a0149b0aeae9b34132b542ac00e2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -181,9 +188,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x439e44478dce3a003227f5354bae5ab1e0a10e3c97055fa5048d774127780486",
-        "network" : "EIP158",
+        "lastblockhash" : "0x7d94d597e5ab30d88f312b11d1c1002ceb60ffa03bdcc639fd224586867f555d",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
                 "code" : "",
@@ -237,10 +251,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d0g0v1_Frontier" : {
+    "RevertDepthCreateOOG_d0g0v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -252,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0xbc04db5f78b8550eb51b22338f623fbbe026cf724cc6ecbbfa3f505d023e692d",
-                    "mixHash" : "0xcf3929dd87b006ddd65297f80e2863881aed1d3dce34df58170cfef5cb823da1",
-                    "nonce" : "0x802e70317a103cf6",
+                    "hash" : "0xb5808af961008ac7a0c33d617d3c435277c58c3f9c500a5842386a5dacbb8193",
+                    "mixHash" : "0x1c1b34a98a15488f78c2e0fab9df3bf1826a8db5993269b9e0e146983740668d",
+                    "nonce" : "0x6ff0f1b4ea783170",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
                     "receiptTrie" : "0x6338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52",
@@ -263,7 +277,7 @@
                     "transactionsTrie" : "0x4a4a5f5ed4b30043d4bc005d7c233207f8b35e9f93e28fa7b78a27822f1bb3ee",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a04a4a5f5ed4b30043d4bc005d7c233207f8b35e9f93e28fa7b78a27822f1bb3eea06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0cf3929dd87b006ddd65297f80e2863881aed1d3dce34df58170cfef5cb823da188802e70317a103cf6f882f88080018301adb094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ca06eea972a7a8069ae1b6154b059125ea8b04f4304eeb688c9fb2446e5685187dea07dfb3835a8e0eb0454e8aa2a5c9e8d5aad18a0149b0aeae9b34132b542ac00e2c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a04a4a5f5ed4b30043d4bc005d7c233207f8b35e9f93e28fa7b78a27822f1bb3eea06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a01c1b34a98a15488f78c2e0fab9df3bf1826a8db5993269b9e0e146983740668d886ff0f1b4ea783170f882f88080018301adb094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ca06eea972a7a8069ae1b6154b059125ea8b04f4304eeb688c9fb2446e5685187dea07dfb3835a8e0eb0454e8aa2a5c9e8d5aad18a0149b0aeae9b34132b542ac00e2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -300,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbc04db5f78b8550eb51b22338f623fbbe026cf724cc6ecbbfa3f505d023e692d",
-        "network" : "Frontier",
+        "lastblockhash" : "0xb5808af961008ac7a0c33d617d3c435277c58c3f9c500a5842386a5dacbb8193",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
@@ -356,10 +370,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d0g0v1_Homestead" : {
+    "RevertDepthCreateOOG_d0g0v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -371,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0xade57d74c8f7a045431f96f96db2ede8a06783a9a4389c750fac2f1443152548",
-                    "mixHash" : "0x996ad346974f94889ebe6d422662a252e34a4ddd5d19e13e6454ab1cc27b30e6",
-                    "nonce" : "0xc77e1a95ae74e3ed",
+                    "hash" : "0x5620f254aa80340d0e7032f3e9a54a1f2df2a0845fc4369ea57459ccde1df202",
+                    "mixHash" : "0xe3bb4e969170b2333b38ea45a1283266f5fa8258769b097d9428a41481cf135a",
+                    "nonce" : "0x1a6a7d1659ddc5f5",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
                     "receiptTrie" : "0x6338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52",
@@ -382,7 +396,7 @@
                     "transactionsTrie" : "0x4a4a5f5ed4b30043d4bc005d7c233207f8b35e9f93e28fa7b78a27822f1bb3ee",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a04a4a5f5ed4b30043d4bc005d7c233207f8b35e9f93e28fa7b78a27822f1bb3eea06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0996ad346974f94889ebe6d422662a252e34a4ddd5d19e13e6454ab1cc27b30e688c77e1a95ae74e3edf882f88080018301adb094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ca06eea972a7a8069ae1b6154b059125ea8b04f4304eeb688c9fb2446e5685187dea07dfb3835a8e0eb0454e8aa2a5c9e8d5aad18a0149b0aeae9b34132b542ac00e2c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a04a4a5f5ed4b30043d4bc005d7c233207f8b35e9f93e28fa7b78a27822f1bb3eea06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0e3bb4e969170b2333b38ea45a1283266f5fa8258769b097d9428a41481cf135a881a6a7d1659ddc5f5f882f88080018301adb094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ca06eea972a7a8069ae1b6154b059125ea8b04f4304eeb688c9fb2446e5685187dea07dfb3835a8e0eb0454e8aa2a5c9e8d5aad18a0149b0aeae9b34132b542ac00e2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -419,8 +433,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xade57d74c8f7a045431f96f96db2ede8a06783a9a4389c750fac2f1443152548",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5620f254aa80340d0e7032f3e9a54a1f2df2a0845fc4369ea57459ccde1df202",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
@@ -475,10 +489,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d0g0v1_Metropolis" : {
+    "RevertDepthCreateOOG_d0g0v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -490,18 +504,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x01b050f7bd75c5a1bca2bee52b9518137cd3dc39d6f028cc35a31bb51e9b6545",
-                    "mixHash" : "0x1ca7634065be74033530db4a85b01ea31ae65b8e578fb009a1e101f8c6322079",
-                    "nonce" : "0x19143d1bcce46eb2",
+                    "hash" : "0x28701bd4e83fbcb1f182724ab0d2de1e7453fae489d715af447c71d3e4417cce",
+                    "mixHash" : "0x0d624dd29c0964e0ee2409c6facc6600b7251335458df338e44b6e6d825808de",
+                    "nonce" : "0x825d88a5a489fe1f",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
-                    "stateRoot" : "0x6ebaaecf252168ea0f4f85a5c67904afc2544cff61141a4a289b23749e79eeb4",
+                    "receiptTrie" : "0x6338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52",
+                    "stateRoot" : "0xb29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4a4a5f5ed4b30043d4bc005d7c233207f8b35e9f93e28fa7b78a27822f1bb3ee",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ebaaecf252168ea0f4f85a5c67904afc2544cff61141a4a289b23749e79eeb4a04a4a5f5ed4b30043d4bc005d7c233207f8b35e9f93e28fa7b78a27822f1bb3eea0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a01ca7634065be74033530db4a85b01ea31ae65b8e578fb009a1e101f8c63220798819143d1bcce46eb2f882f88080018301adb094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ca06eea972a7a8069ae1b6154b059125ea8b04f4304eeb688c9fb2446e5685187dea07dfb3835a8e0eb0454e8aa2a5c9e8d5aad18a0149b0aeae9b34132b542ac00e2c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a04a4a5f5ed4b30043d4bc005d7c233207f8b35e9f93e28fa7b78a27822f1bb3eea06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a00d624dd29c0964e0ee2409c6facc6600b7251335458df338e44b6e6d825808de88825d88a5a489fe1ff882f88080018301adb094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ca06eea972a7a8069ae1b6154b059125ea8b04f4304eeb688c9fb2446e5685187dea07dfb3835a8e0eb0454e8aa2a5c9e8d5aad18a0149b0aeae9b34132b542ac00e2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -538,16 +552,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x01b050f7bd75c5a1bca2bee52b9518137cd3dc39d6f028cc35a31bb51e9b6545",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x28701bd4e83fbcb1f182724ab0d2de1e7453fae489d715af447c71d3e4417cce",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5adb0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a36250",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertDepthCreateOOG_d0g0v1_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g0v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x1789d7a04c373358a76ed5bde063cda14891ed2022298700562c003dd851d131",
+                    "mixHash" : "0x965fe28efbefcb2b9693d913d35e38fd0923070c9ea41a5102c613e88367dcc5",
+                    "nonce" : "0xf94f9efce70ce800",
+                    "number" : "0x01",
+                    "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
+                    "receiptTrie" : "0x6338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52",
+                    "stateRoot" : "0xb29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4a4a5f5ed4b30043d4bc005d7c233207f8b35e9f93e28fa7b78a27822f1bb3ee",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a04a4a5f5ed4b30043d4bc005d7c233207f8b35e9f93e28fa7b78a27822f1bb3eea06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0965fe28efbefcb2b9693d913d35e38fd0923070c9ea41a5102c613e88367dcc588f94f9efce70ce800f882f88080018301adb094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ca06eea972a7a8069ae1b6154b059125ea8b04f4304eeb688c9fb2446e5685187dea07dfb3835a8e0eb0454e8aa2a5c9e8d5aad18a0149b0aeae9b34132b542ac00e2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6eea972a7a8069ae1b6154b059125ea8b04f4304eeb688c9fb2446e5685187de",
+                        "s" : "0x7dfb3835a8e0eb0454e8aa2a5c9e8d5aad18a0149b0aeae9b34132b542ac00e2",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1789d7a04c373358a76ed5bde063cda14891ed2022298700562c003dd851d131",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d0g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d0g1v0.json
index b73a4fe4d..261b769ed 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertDepthCreateOOG_d0g1v0_EIP150" : {
+    "RevertDepthCreateOOG_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01f013",
-                    "hash" : "0x267b4b6187d9b5963e1eeede5d56d19d57a15efd343387e7cafb0e05ed381e13",
-                    "mixHash" : "0x4be90108a54367a8b3d1a73488fcd9f772a1837ca57ecc8a729ce5163c3d6957",
-                    "nonce" : "0xc42e748b63483d8f",
+                    "hash" : "0x285edf0179a9a87b78cad2c875451151f00f251b43cbd447312e1269fd3e6bea",
+                    "mixHash" : "0xe5a233654db7f99b92fe922897dc9ba6d185bc6d628379c3acee12b9620f8a77",
+                    "nonce" : "0x568730946441bcf0",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0xf5f2df568bae025a063dc95e8462a5529fd58cb0a960a472bafdd4c7255af90d",
-                    "stateRoot" : "0x3c7d96634b75179a9a5df972bf6d5eac7ed107e03fb6323c029bd92e12a3896f",
+                    "receiptTrie" : "0xc45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11",
+                    "stateRoot" : "0x929898ba865d835c105c4fac147f1a7095e69eb36bb684d8171887c43760e46d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xce90b155c5542ddc764a1cfb91ebd22df2c6f1fda09bc35dc1a143e657557d50",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c7d96634b75179a9a5df972bf6d5eac7ed107e03fb6323c029bd92e12a3896fa0ce90b155c5542ddc764a1cfb91ebd22df2c6f1fda09bc35dc1a143e657557d50a0f5f2df568bae025a063dc95e8462a5529fd58cb0a960a472bafdd4c7255af90db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a04be90108a54367a8b3d1a73488fcd9f772a1837ca57ecc8a729ce5163c3d695788c42e748b63483d8ff882f88080018302710094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000ea601ba03a80bf0a9925e50d34924ddfa6a1fc4b48fb347e6988b0ee381676c037572c05a0037178238887a77f295b801524f529a816694338480aeac8ce031aea3975e2a1c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0929898ba865d835c105c4fac147f1a7095e69eb36bb684d8171887c43760e46da0ce90b155c5542ddc764a1cfb91ebd22df2c6f1fda09bc35dc1a143e657557d50a0c45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a0e5a233654db7f99b92fe922897dc9ba6d185bc6d628379c3acee12b9620f8a7788568730946441bcf0f882f88080018302710094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000ea601ba03a80bf0a9925e50d34924ddfa6a1fc4b48fb347e6988b0ee381676c037572c05a0037178238887a77f295b801524f529a816694338480aeac8ce031aea3975e2a1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x267b4b6187d9b5963e1eeede5d56d19d57a15efd343387e7cafb0e05ed381e13",
-        "network" : "EIP150",
+        "lastblockhash" : "0x285edf0179a9a87b78cad2c875451151f00f251b43cbd447312e1269fd3e6bea",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5f013",
                 "code" : "",
@@ -120,10 +127,138 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d0g1v0_EIP158" : {
+    "RevertDepthCreateOOG_d0g1v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01f013",
+                    "hash" : "0x3c1f7b07b2195dbf88ca8b380011bc5a9bac3df6528d4c76435f7668640bf4a6",
+                    "mixHash" : "0x951562bd3ece958a3247b142b13c440c38ead577826ebd51b52207016a187a7e",
+                    "nonce" : "0x9fb256b36c1a0ebb",
+                    "number" : "0x01",
+                    "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
+                    "receiptTrie" : "0xc45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11",
+                    "stateRoot" : "0x929898ba865d835c105c4fac147f1a7095e69eb36bb684d8171887c43760e46d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xce90b155c5542ddc764a1cfb91ebd22df2c6f1fda09bc35dc1a143e657557d50",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0929898ba865d835c105c4fac147f1a7095e69eb36bb684d8171887c43760e46da0ce90b155c5542ddc764a1cfb91ebd22df2c6f1fda09bc35dc1a143e657557d50a0c45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a0951562bd3ece958a3247b142b13c440c38ead577826ebd51b52207016a187a7e889fb256b36c1a0ebbf882f88080018302710094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000ea601ba03a80bf0a9925e50d34924ddfa6a1fc4b48fb347e6988b0ee381676c037572c05a0037178238887a77f295b801524f529a816694338480aeac8ce031aea3975e2a1c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
+                        "gasLimit" : "0x027100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3a80bf0a9925e50d34924ddfa6a1fc4b48fb347e6988b0ee381676c037572c05",
+                        "s" : "0x037178238887a77f295b801524f529a816694338480aeac8ce031aea3975e2a1",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3c1f7b07b2195dbf88ca8b380011bc5a9bac3df6528d4c76435f7668640bf4a6",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5f013",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x06",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x04" : "0x0c"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a31fec",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertDepthCreateOOG_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -135,9 +270,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01f013",
-                    "hash" : "0xee72b998b98872c39082b508eb1b761aac32b39f131a56e4a1342b508f8381d3",
-                    "mixHash" : "0xc81b413196bc8339b6d932d31a997a6eee3950a9e25351a3f1ffda35ceefea6b",
-                    "nonce" : "0x7f94d0254cb028d9",
+                    "hash" : "0x0296aa8e0504090091423e63e1e5efe76312e466490186ebd527b8f5992af126",
+                    "mixHash" : "0x32ee6bb22d85ebfdd81a7d73947ef0f0dfdcf3333c3b3b5454affd016d29c907",
+                    "nonce" : "0x6c27b941bf5db359",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
                     "receiptTrie" : "0xf5f2df568bae025a063dc95e8462a5529fd58cb0a960a472bafdd4c7255af90d",
@@ -146,7 +281,7 @@
                     "transactionsTrie" : "0xce90b155c5542ddc764a1cfb91ebd22df2c6f1fda09bc35dc1a143e657557d50",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c7d96634b75179a9a5df972bf6d5eac7ed107e03fb6323c029bd92e12a3896fa0ce90b155c5542ddc764a1cfb91ebd22df2c6f1fda09bc35dc1a143e657557d50a0f5f2df568bae025a063dc95e8462a5529fd58cb0a960a472bafdd4c7255af90db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a0c81b413196bc8339b6d932d31a997a6eee3950a9e25351a3f1ffda35ceefea6b887f94d0254cb028d9f882f88080018302710094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000ea601ba03a80bf0a9925e50d34924ddfa6a1fc4b48fb347e6988b0ee381676c037572c05a0037178238887a77f295b801524f529a816694338480aeac8ce031aea3975e2a1c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c7d96634b75179a9a5df972bf6d5eac7ed107e03fb6323c029bd92e12a3896fa0ce90b155c5542ddc764a1cfb91ebd22df2c6f1fda09bc35dc1a143e657557d50a0f5f2df568bae025a063dc95e8462a5529fd58cb0a960a472bafdd4c7255af90db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a032ee6bb22d85ebfdd81a7d73947ef0f0dfdcf3333c3b3b5454affd016d29c907886c27b941bf5db359f882f88080018302710094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000ea601ba03a80bf0a9925e50d34924ddfa6a1fc4b48fb347e6988b0ee381676c037572c05a0037178238887a77f295b801524f529a816694338480aeac8ce031aea3975e2a1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -183,8 +318,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xee72b998b98872c39082b508eb1b761aac32b39f131a56e4a1342b508f8381d3",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0296aa8e0504090091423e63e1e5efe76312e466490186ebd527b8f5992af126",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5f013",
@@ -241,10 +376,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d0g1v0_Frontier" : {
+    "RevertDepthCreateOOG_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -255,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01ed7f",
-                    "hash" : "0x403e60c99579f0368c98061ce5d6b85469e70940588797ef4e6884c4853626c1",
-                    "mixHash" : "0xc97fb2947d5ca4092ec7edefb568009b5ecee4a3ff2432ee28b51f96d5a98a80",
-                    "nonce" : "0xc71005315de135cf",
+                    "gasUsed" : "0x01f013",
+                    "hash" : "0x61d9521afda8d4f6f729da7a754dde72a58a426c642be944e9dea196cbf538ec",
+                    "mixHash" : "0xb68e82f2df3e5801bd5c54db9f8284fd5dd00207ccd50ae5339d55e4b6fd3c24",
+                    "nonce" : "0xa1cf7daf9ec21da2",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0x2c9c485b0f0bb4d85b62ff83f96ec39e6f001fc9c1c08b4cfc2802548b67ebc4",
-                    "stateRoot" : "0xeaba8b78bfdb1481288d08fdd94b3c15bb6d8ac61376c0aa132887bded332adc",
+                    "receiptTrie" : "0xf5f2df568bae025a063dc95e8462a5529fd58cb0a960a472bafdd4c7255af90d",
+                    "stateRoot" : "0x3c7d96634b75179a9a5df972bf6d5eac7ed107e03fb6323c029bd92e12a3896f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xce90b155c5542ddc764a1cfb91ebd22df2c6f1fda09bc35dc1a143e657557d50",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eaba8b78bfdb1481288d08fdd94b3c15bb6d8ac61376c0aa132887bded332adca0ce90b155c5542ddc764a1cfb91ebd22df2c6f1fda09bc35dc1a143e657557d50a02c9c485b0f0bb4d85b62ff83f96ec39e6f001fc9c1c08b4cfc2802548b67ebc4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ed7f8203e880a0c97fb2947d5ca4092ec7edefb568009b5ecee4a3ff2432ee28b51f96d5a98a8088c71005315de135cff882f88080018302710094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000ea601ba03a80bf0a9925e50d34924ddfa6a1fc4b48fb347e6988b0ee381676c037572c05a0037178238887a77f295b801524f529a816694338480aeac8ce031aea3975e2a1c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c7d96634b75179a9a5df972bf6d5eac7ed107e03fb6323c029bd92e12a3896fa0ce90b155c5542ddc764a1cfb91ebd22df2c6f1fda09bc35dc1a143e657557d50a0f5f2df568bae025a063dc95e8462a5529fd58cb0a960a472bafdd4c7255af90db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a0b68e82f2df3e5801bd5c54db9f8284fd5dd00207ccd50ae5339d55e4b6fd3c2488a1cf7daf9ec21da2f882f88080018302710094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000ea601ba03a80bf0a9925e50d34924ddfa6a1fc4b48fb347e6988b0ee381676c037572c05a0037178238887a77f295b801524f529a816694338480aeac8ce031aea3975e2a1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -304,11 +439,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x403e60c99579f0368c98061ce5d6b85469e70940588797ef4e6884c4853626c1",
-        "network" : "Frontier",
+        "lastblockhash" : "0x61d9521afda8d4f6f729da7a754dde72a58a426c642be944e9dea196cbf538ec",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5ed7f",
+                "balance" : "0x4563918244f5f013",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -324,7 +459,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a32280",
+                "balance" : "0xe8d4a31fec",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -362,10 +497,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d0g1v0_Homestead" : {
+    "RevertDepthCreateOOG_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +512,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01ed7f",
-                    "hash" : "0x16bcfc29b2c3ce9a238374c30ceaf1d381455339a50fae951928f943019ce909",
-                    "mixHash" : "0x5bcb484167f31b0131d000184cb10c2c6dc70b75f410a49c0ed347958f1167fb",
-                    "nonce" : "0xd50aedef4a9fbf99",
+                    "hash" : "0xbfc02d98f418833d16e399224f131402d00d89af0feee20fce6b729b6a9ebeea",
+                    "mixHash" : "0x07bfb2fbfc3878c724215b6e86f5c6d109e5e48b5c2eaacc008011b6b0bbeb03",
+                    "nonce" : "0xc9e9a8c7b711fe73",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
                     "receiptTrie" : "0x2c9c485b0f0bb4d85b62ff83f96ec39e6f001fc9c1c08b4cfc2802548b67ebc4",
@@ -388,7 +523,7 @@
                     "transactionsTrie" : "0xce90b155c5542ddc764a1cfb91ebd22df2c6f1fda09bc35dc1a143e657557d50",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eaba8b78bfdb1481288d08fdd94b3c15bb6d8ac61376c0aa132887bded332adca0ce90b155c5542ddc764a1cfb91ebd22df2c6f1fda09bc35dc1a143e657557d50a02c9c485b0f0bb4d85b62ff83f96ec39e6f001fc9c1c08b4cfc2802548b67ebc4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ed7f8203e880a05bcb484167f31b0131d000184cb10c2c6dc70b75f410a49c0ed347958f1167fb88d50aedef4a9fbf99f882f88080018302710094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000ea601ba03a80bf0a9925e50d34924ddfa6a1fc4b48fb347e6988b0ee381676c037572c05a0037178238887a77f295b801524f529a816694338480aeac8ce031aea3975e2a1c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eaba8b78bfdb1481288d08fdd94b3c15bb6d8ac61376c0aa132887bded332adca0ce90b155c5542ddc764a1cfb91ebd22df2c6f1fda09bc35dc1a143e657557d50a02c9c485b0f0bb4d85b62ff83f96ec39e6f001fc9c1c08b4cfc2802548b67ebc4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ed7f8203e880a007bfb2fbfc3878c724215b6e86f5c6d109e5e48b5c2eaacc008011b6b0bbeb0388c9e9a8c7b711fe73f882f88080018302710094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000ea601ba03a80bf0a9925e50d34924ddfa6a1fc4b48fb347e6988b0ee381676c037572c05a0037178238887a77f295b801524f529a816694338480aeac8ce031aea3975e2a1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -425,8 +560,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x16bcfc29b2c3ce9a238374c30ceaf1d381455339a50fae951928f943019ce909",
-        "network" : "Homestead",
+        "lastblockhash" : "0xbfc02d98f418833d16e399224f131402d00d89af0feee20fce6b729b6a9ebeea",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5ed7f",
@@ -483,10 +618,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d0g1v0_Metropolis" : {
+    "RevertDepthCreateOOG_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -497,19 +632,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01f013",
-                    "hash" : "0xdedab24400d76d3516f2e32e10b49e9df827de5057bc934db923aa6cbb64ff76",
-                    "mixHash" : "0xa87bc89b84c8a409f332f47d3424e1d326b0015dc49853f09b58f19a54f83746",
-                    "nonce" : "0x535d42e94648c4ff",
+                    "gasUsed" : "0x01ed7f",
+                    "hash" : "0x5a56b1334aae839720bb15e50bc064030faf0fbe093cb3fed17629fd079f4d67",
+                    "mixHash" : "0x3d7d1179d4d8db465e643c67dda4513844fb1ff44413b78e1d8e55332004f388",
+                    "nonce" : "0xf5b7befc1c4699ce",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0xc45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11",
-                    "stateRoot" : "0x929898ba865d835c105c4fac147f1a7095e69eb36bb684d8171887c43760e46d",
+                    "receiptTrie" : "0x2c9c485b0f0bb4d85b62ff83f96ec39e6f001fc9c1c08b4cfc2802548b67ebc4",
+                    "stateRoot" : "0xeaba8b78bfdb1481288d08fdd94b3c15bb6d8ac61376c0aa132887bded332adc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xce90b155c5542ddc764a1cfb91ebd22df2c6f1fda09bc35dc1a143e657557d50",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0929898ba865d835c105c4fac147f1a7095e69eb36bb684d8171887c43760e46da0ce90b155c5542ddc764a1cfb91ebd22df2c6f1fda09bc35dc1a143e657557d50a0c45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a0a87bc89b84c8a409f332f47d3424e1d326b0015dc49853f09b58f19a54f8374688535d42e94648c4fff882f88080018302710094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000ea601ba03a80bf0a9925e50d34924ddfa6a1fc4b48fb347e6988b0ee381676c037572c05a0037178238887a77f295b801524f529a816694338480aeac8ce031aea3975e2a1c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eaba8b78bfdb1481288d08fdd94b3c15bb6d8ac61376c0aa132887bded332adca0ce90b155c5542ddc764a1cfb91ebd22df2c6f1fda09bc35dc1a143e657557d50a02c9c485b0f0bb4d85b62ff83f96ec39e6f001fc9c1c08b4cfc2802548b67ebc4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ed7f8203e880a03d7d1179d4d8db465e643c67dda4513844fb1ff44413b78e1d8e55332004f38888f5b7befc1c4699cef882f88080018302710094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000ea601ba03a80bf0a9925e50d34924ddfa6a1fc4b48fb347e6988b0ee381676c037572c05a0037178238887a77f295b801524f529a816694338480aeac8ce031aea3975e2a1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -546,18 +681,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdedab24400d76d3516f2e32e10b49e9df827de5057bc934db923aa6cbb64ff76",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x5a56b1334aae839720bb15e50bc064030faf0fbe093cb3fed17629fd079f4d67",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5f013",
+                "balance" : "0x4563918244f5ed7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -573,7 +701,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a31fec",
+                "balance" : "0xe8d4a32280",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d0g1v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d0g1v1.json
index fe190cba2..348f84927 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d0g1v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d0g1v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertDepthCreateOOG_d0g1v1_EIP150" : {
+    "RevertDepthCreateOOG_d0g1v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01f013",
-                    "hash" : "0xee44bd67a908a06b3bbb7b5e3c59aee46ad4025660031a05814c2d717b55a177",
-                    "mixHash" : "0x27b63cb89572da5327d5a30bc47dec26a3c7198a2d8bbc912535f1f236a3eea9",
-                    "nonce" : "0xc61a7400911830ac",
+                    "hash" : "0xa9448e505e32918341fbbbd31f0c47cd6ae6b47d2c23fdd6a4ee52c726944384",
+                    "mixHash" : "0x774a42c9454863c03eae2ba44b2635ea40cfa26480e3d67a13eacd35792a0f63",
+                    "nonce" : "0xd7cbf4e31a478c62",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0x978aa80ebc7fabf0f3d7dddf1013bf01a12b0d5d35ee2e7b1a226491fb0befae",
-                    "stateRoot" : "0xc25c95d935ec6586c0a87cfb9e0060fdea473943710acde3bd4445a691123366",
+                    "receiptTrie" : "0xc45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11",
+                    "stateRoot" : "0x4974535ec7ce793ec8208db3cf2e4efee6f0281802fc051175b85320bf95d018",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491db",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c25c95d935ec6586c0a87cfb9e0060fdea473943710acde3bd4445a691123366a0d16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491dba0978aa80ebc7fabf0f3d7dddf1013bf01a12b0d5d35ee2e7b1a226491fb0befaeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a027b63cb89572da5327d5a30bc47dec26a3c7198a2d8bbc912535f1f236a3eea988c61a7400911830acf882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba00d3efad132a16ecbd402eb6ef10a0b7d4749ce5576ba1db230ed64b745d68dfaa0400e0d8b3b47d8c3b8254dcdb5ceb709f90c5b74d4c26c9eaad9dd69ed97a74fc0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04974535ec7ce793ec8208db3cf2e4efee6f0281802fc051175b85320bf95d018a0d16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491dba0c45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a0774a42c9454863c03eae2ba44b2635ea40cfa26480e3d67a13eacd35792a0f6388d7cbf4e31a478c62f882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba00d3efad132a16ecbd402eb6ef10a0b7d4749ce5576ba1db230ed64b745d68dfaa0400e0d8b3b47d8c3b8254dcdb5ceb709f90c5b74d4c26c9eaad9dd69ed97a74fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xee44bd67a908a06b3bbb7b5e3c59aee46ad4025660031a05814c2d717b55a177",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa9448e505e32918341fbbbd31f0c47cd6ae6b47d2c23fdd6a4ee52c726944384",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5f013",
                 "code" : "",
@@ -120,10 +127,138 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d0g1v1_EIP158" : {
+    "RevertDepthCreateOOG_d0g1v1_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g1v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01f013",
+                    "hash" : "0x669a8d92f814440569d7c3d8bb684a9f0fadeaa646fb9b6d6ed9bc03dc1c1953",
+                    "mixHash" : "0x542a8d0a4b03f3993a3d2e29f33ea39b3f158e3543345adfc2a712883d7af932",
+                    "nonce" : "0xe695e9370d4920f5",
+                    "number" : "0x01",
+                    "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
+                    "receiptTrie" : "0xc45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11",
+                    "stateRoot" : "0x4974535ec7ce793ec8208db3cf2e4efee6f0281802fc051175b85320bf95d018",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491db",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04974535ec7ce793ec8208db3cf2e4efee6f0281802fc051175b85320bf95d018a0d16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491dba0c45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a0542a8d0a4b03f3993a3d2e29f33ea39b3f158e3543345adfc2a712883d7af93288e695e9370d4920f5f882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba00d3efad132a16ecbd402eb6ef10a0b7d4749ce5576ba1db230ed64b745d68dfaa0400e0d8b3b47d8c3b8254dcdb5ceb709f90c5b74d4c26c9eaad9dd69ed97a74fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
+                        "gasLimit" : "0x027100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0d3efad132a16ecbd402eb6ef10a0b7d4749ce5576ba1db230ed64b745d68dfa",
+                        "s" : "0x400e0d8b3b47d8c3b8254dcdb5ceb709f90c5b74d4c26c9eaad9dd69ed97a74f",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x669a8d92f814440569d7c3d8bb684a9f0fadeaa646fb9b6d6ed9bc03dc1c1953",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5f013",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x04" : "0x0c"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a31fed",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertDepthCreateOOG_d0g1v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -135,9 +270,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01f013",
-                    "hash" : "0xcd2996ab210fdfed4ca13a65277b7429188e3c1f911408066153ff2843b09c7f",
-                    "mixHash" : "0x77eb63be04f59375a897244be50f5df5a43ba9dd0a2571fa4c94bf86ea561bf0",
-                    "nonce" : "0x04b22305a3aa14fb",
+                    "hash" : "0x9be0f3889b06cfd87418e17375bf19ab63aa03da2d6ef759c2f5d605533701e5",
+                    "mixHash" : "0x538e3421f0ad06e8ac027b39d1a11ccc994815dadde67cdc0cd3089bd9e0ab14",
+                    "nonce" : "0x21d04f98ce3c449f",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
                     "receiptTrie" : "0x978aa80ebc7fabf0f3d7dddf1013bf01a12b0d5d35ee2e7b1a226491fb0befae",
@@ -146,7 +281,7 @@
                     "transactionsTrie" : "0xd16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491db",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c25c95d935ec6586c0a87cfb9e0060fdea473943710acde3bd4445a691123366a0d16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491dba0978aa80ebc7fabf0f3d7dddf1013bf01a12b0d5d35ee2e7b1a226491fb0befaeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a077eb63be04f59375a897244be50f5df5a43ba9dd0a2571fa4c94bf86ea561bf08804b22305a3aa14fbf882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba00d3efad132a16ecbd402eb6ef10a0b7d4749ce5576ba1db230ed64b745d68dfaa0400e0d8b3b47d8c3b8254dcdb5ceb709f90c5b74d4c26c9eaad9dd69ed97a74fc0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c25c95d935ec6586c0a87cfb9e0060fdea473943710acde3bd4445a691123366a0d16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491dba0978aa80ebc7fabf0f3d7dddf1013bf01a12b0d5d35ee2e7b1a226491fb0befaeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a0538e3421f0ad06e8ac027b39d1a11ccc994815dadde67cdc0cd3089bd9e0ab148821d04f98ce3c449ff882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba00d3efad132a16ecbd402eb6ef10a0b7d4749ce5576ba1db230ed64b745d68dfaa0400e0d8b3b47d8c3b8254dcdb5ceb709f90c5b74d4c26c9eaad9dd69ed97a74fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -183,8 +318,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcd2996ab210fdfed4ca13a65277b7429188e3c1f911408066153ff2843b09c7f",
-        "network" : "EIP158",
+        "lastblockhash" : "0x9be0f3889b06cfd87418e17375bf19ab63aa03da2d6ef759c2f5d605533701e5",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5f013",
@@ -241,10 +376,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d0g1v1_Frontier" : {
+    "RevertDepthCreateOOG_d0g1v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -255,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01ed7f",
-                    "hash" : "0x34fd6f5bd7d21990f1224489e52fceffa29d4667bef0c0d4bd85ba19fc0caa5d",
-                    "mixHash" : "0x142deeaae894161c030525ca28e4a27a7c717645ea8ffef9f9c395a99133b8d1",
-                    "nonce" : "0xcee774a6f361e6c8",
+                    "gasUsed" : "0x01f013",
+                    "hash" : "0xf5e7666325ac78572c40ae38342ce781c23f53f87559fec2aa72ad18470ac1ba",
+                    "mixHash" : "0x0986098e23a561053c78fcbeb995376ec2d01387e84eecfbed609cd106a0845a",
+                    "nonce" : "0x814418e25dde2ebe",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0xd482f10f789727dfc25e2c87a5ae7bba35d6140c0cfb999ad7f445faf176a354",
-                    "stateRoot" : "0x7bbb5431e0c08dc8b31cf9cfe3b7548213147bcca8ef9167795b2dac6a92d55a",
+                    "receiptTrie" : "0x978aa80ebc7fabf0f3d7dddf1013bf01a12b0d5d35ee2e7b1a226491fb0befae",
+                    "stateRoot" : "0xc25c95d935ec6586c0a87cfb9e0060fdea473943710acde3bd4445a691123366",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491db",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07bbb5431e0c08dc8b31cf9cfe3b7548213147bcca8ef9167795b2dac6a92d55aa0d16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491dba0d482f10f789727dfc25e2c87a5ae7bba35d6140c0cfb999ad7f445faf176a354b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ed7f8203e880a0142deeaae894161c030525ca28e4a27a7c717645ea8ffef9f9c395a99133b8d188cee774a6f361e6c8f882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba00d3efad132a16ecbd402eb6ef10a0b7d4749ce5576ba1db230ed64b745d68dfaa0400e0d8b3b47d8c3b8254dcdb5ceb709f90c5b74d4c26c9eaad9dd69ed97a74fc0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c25c95d935ec6586c0a87cfb9e0060fdea473943710acde3bd4445a691123366a0d16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491dba0978aa80ebc7fabf0f3d7dddf1013bf01a12b0d5d35ee2e7b1a226491fb0befaeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a00986098e23a561053c78fcbeb995376ec2d01387e84eecfbed609cd106a0845a88814418e25dde2ebef882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba00d3efad132a16ecbd402eb6ef10a0b7d4749ce5576ba1db230ed64b745d68dfaa0400e0d8b3b47d8c3b8254dcdb5ceb709f90c5b74d4c26c9eaad9dd69ed97a74fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -304,11 +439,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x34fd6f5bd7d21990f1224489e52fceffa29d4667bef0c0d4bd85ba19fc0caa5d",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf5e7666325ac78572c40ae38342ce781c23f53f87559fec2aa72ad18470ac1ba",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5ed7f",
+                "balance" : "0x4563918244f5f013",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -324,7 +459,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a32281",
+                "balance" : "0xe8d4a31fed",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -362,10 +497,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d0g1v1_Homestead" : {
+    "RevertDepthCreateOOG_d0g1v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -377,9 +512,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01ed7f",
-                    "hash" : "0x74fcb892d972fd61888158b1e32276d4d09510dfc9ce563d68617edab457f27f",
-                    "mixHash" : "0xc5a0a92ac924cfc2aca8e970b396d4a54af6a3024bfdcf0634d6df3a8f06b29c",
-                    "nonce" : "0x199e6560a257e759",
+                    "hash" : "0x838cef3b287d30c2bf5890d78c98283cb17b4a9ad27e5a5183136d5c39ea5fb6",
+                    "mixHash" : "0xc9a12900fefea6f5dbe0bdda19e1adf9241103feef1b8ce99107a15014549d42",
+                    "nonce" : "0x5a1ff4eb7327ae73",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
                     "receiptTrie" : "0xd482f10f789727dfc25e2c87a5ae7bba35d6140c0cfb999ad7f445faf176a354",
@@ -388,7 +523,7 @@
                     "transactionsTrie" : "0xd16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491db",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07bbb5431e0c08dc8b31cf9cfe3b7548213147bcca8ef9167795b2dac6a92d55aa0d16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491dba0d482f10f789727dfc25e2c87a5ae7bba35d6140c0cfb999ad7f445faf176a354b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ed7f8203e880a0c5a0a92ac924cfc2aca8e970b396d4a54af6a3024bfdcf0634d6df3a8f06b29c88199e6560a257e759f882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba00d3efad132a16ecbd402eb6ef10a0b7d4749ce5576ba1db230ed64b745d68dfaa0400e0d8b3b47d8c3b8254dcdb5ceb709f90c5b74d4c26c9eaad9dd69ed97a74fc0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07bbb5431e0c08dc8b31cf9cfe3b7548213147bcca8ef9167795b2dac6a92d55aa0d16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491dba0d482f10f789727dfc25e2c87a5ae7bba35d6140c0cfb999ad7f445faf176a354b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ed7f8203e880a0c9a12900fefea6f5dbe0bdda19e1adf9241103feef1b8ce99107a15014549d42885a1ff4eb7327ae73f882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba00d3efad132a16ecbd402eb6ef10a0b7d4749ce5576ba1db230ed64b745d68dfaa0400e0d8b3b47d8c3b8254dcdb5ceb709f90c5b74d4c26c9eaad9dd69ed97a74fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -425,8 +560,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x74fcb892d972fd61888158b1e32276d4d09510dfc9ce563d68617edab457f27f",
-        "network" : "Homestead",
+        "lastblockhash" : "0x838cef3b287d30c2bf5890d78c98283cb17b4a9ad27e5a5183136d5c39ea5fb6",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5ed7f",
@@ -483,10 +618,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d0g1v1_Metropolis" : {
+    "RevertDepthCreateOOG_d0g1v1_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -497,19 +632,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01f013",
-                    "hash" : "0x9784c34a84767da56b20709c94d09575e3a7cadc2c458ace2d744fb36a54e3e8",
-                    "mixHash" : "0xe91cea523c554daaa5946e04bb4bd33858874577af7bb258cab222a378ab2362",
-                    "nonce" : "0xced21ea6ce9ecadb",
+                    "gasUsed" : "0x01ed7f",
+                    "hash" : "0x84a8d078206ecb99b3e958d9679effafc96183dae67093ae90d15dca8fd31886",
+                    "mixHash" : "0x05e58421142d88f529dcced7c569eb09d1262f653817a1b0c6267a9c2fa4255b",
+                    "nonce" : "0x9ee33af68657a237",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0xc45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11",
-                    "stateRoot" : "0x4974535ec7ce793ec8208db3cf2e4efee6f0281802fc051175b85320bf95d018",
+                    "receiptTrie" : "0xd482f10f789727dfc25e2c87a5ae7bba35d6140c0cfb999ad7f445faf176a354",
+                    "stateRoot" : "0x7bbb5431e0c08dc8b31cf9cfe3b7548213147bcca8ef9167795b2dac6a92d55a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491db",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04974535ec7ce793ec8208db3cf2e4efee6f0281802fc051175b85320bf95d018a0d16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491dba0c45419cf5be26b875697d913666fdf6c36cc72b128a9670c994caed02690eb11b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301f0138203e880a0e91cea523c554daaa5946e04bb4bd33858874577af7bb258cab222a378ab236288ced21ea6ce9ecadbf882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba00d3efad132a16ecbd402eb6ef10a0b7d4749ce5576ba1db230ed64b745d68dfaa0400e0d8b3b47d8c3b8254dcdb5ceb709f90c5b74d4c26c9eaad9dd69ed97a74fc0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07bbb5431e0c08dc8b31cf9cfe3b7548213147bcca8ef9167795b2dac6a92d55aa0d16f44bcea69be4827aedd56930f535df55672d106d8e366abab14c1fff491dba0d482f10f789727dfc25e2c87a5ae7bba35d6140c0cfb999ad7f445faf176a354b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301ed7f8203e880a005e58421142d88f529dcced7c569eb09d1262f653817a1b0c6267a9c2fa4255b889ee33af68657a237f882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba00d3efad132a16ecbd402eb6ef10a0b7d4749ce5576ba1db230ed64b745d68dfaa0400e0d8b3b47d8c3b8254dcdb5ceb709f90c5b74d4c26c9eaad9dd69ed97a74fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
@@ -546,18 +681,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9784c34a84767da56b20709c94d09575e3a7cadc2c458ace2d744fb36a54e3e8",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x84a8d078206ecb99b3e958d9679effafc96183dae67093ae90d15dca8fd31886",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5f013",
+                "balance" : "0x4563918244f5ed7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -573,7 +701,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a31fed",
+                "balance" : "0xe8d4a32281",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d1g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d1g0v0.json
index bcd4edeed..114bf85ed 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d1g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d1g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertDepthCreateOOG_d1g0v0_EIP150" : {
+    "RevertDepthCreateOOG_d1g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x97443d2037899a286e07db6ca8c44fd5adc59aff6cccf2bb39d5a933fb917cef",
-                    "mixHash" : "0x038f2a1feb156e841afaf429a61cbd3eba0f1ba23322dbd9a153c00a863d9085",
-                    "nonce" : "0xb5c3e2e34d846cd0",
+                    "hash" : "0x27aac7ab09f8a95d69ff46dd80724c05573c54911ab8245e46ad14106c3a4d09",
+                    "mixHash" : "0x1966580471bb5d225cfabcd59b3cab8bd1cbfdff49c7db3f6b240d26aaca9c9c",
+                    "nonce" : "0x1a8668676bbf966f",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0x6338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52",
-                    "stateRoot" : "0xb29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x6ebaaecf252168ea0f4f85a5c67904afc2544cff61141a4a289b23749e79eeb4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb2853f0fa00a44e9eff23b1551dd5b3b783233bb794ffe55cc9994731c8948ba",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a0b2853f0fa00a44e9eff23b1551dd5b3b783233bb794ffe55cc9994731c8948baa06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0038f2a1feb156e841afaf429a61cbd3eba0f1ba23322dbd9a153c00a863d908588b5c3e2e34d846cd0f882f88080018301adb094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000001ea601ca04213ac8b4b3c33b23dd2dfda78529cb401df8f842615a619da4b37aa8038f5e7a0202463edf05016446b9da81c28cfdab638b6b38951cf125c301152b519af81a9c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ebaaecf252168ea0f4f85a5c67904afc2544cff61141a4a289b23749e79eeb4a0b2853f0fa00a44e9eff23b1551dd5b3b783233bb794ffe55cc9994731c8948baa0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a01966580471bb5d225cfabcd59b3cab8bd1cbfdff49c7db3f6b240d26aaca9c9c881a8668676bbf966ff882f88080018301adb094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000001ea601ca04213ac8b4b3c33b23dd2dfda78529cb401df8f842615a619da4b37aa8038f5e7a0202463edf05016446b9da81c28cfdab638b6b38951cf125c301152b519af81a9c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x97443d2037899a286e07db6ca8c44fd5adc59aff6cccf2bb39d5a933fb917cef",
-        "network" : "EIP150",
+        "lastblockhash" : "0x27aac7ab09f8a95d69ff46dd80724c05573c54911ab8245e46ad14106c3a4d09",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
                 "code" : "",
@@ -118,10 +125,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d1g0v0_EIP158" : {
+    "RevertDepthCreateOOG_d1g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -133,18 +140,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0xb67c93f61cce9cecd496cce109a775311f1edba83f68acc4c2ca0367f55b7e40",
-                    "mixHash" : "0x9337228fc2a3da4ab4c0d4299a5cc06b6c3da7d896cbeb5836c3e705aa356e79",
-                    "nonce" : "0xa96f507b8940ac8b",
+                    "hash" : "0x3589eb7d53c81762321a5ed124edc5842eb679abb85c25c149b032131f6e9c91",
+                    "mixHash" : "0x0b6ab50cb501867950261d813d5cf45c57759d0d7c0918f75079c91e8d514e00",
+                    "nonce" : "0x8f49450c1c0d394d",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0x6338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52",
-                    "stateRoot" : "0xb29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x6ebaaecf252168ea0f4f85a5c67904afc2544cff61141a4a289b23749e79eeb4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb2853f0fa00a44e9eff23b1551dd5b3b783233bb794ffe55cc9994731c8948ba",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a0b2853f0fa00a44e9eff23b1551dd5b3b783233bb794ffe55cc9994731c8948baa06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a09337228fc2a3da4ab4c0d4299a5cc06b6c3da7d896cbeb5836c3e705aa356e7988a96f507b8940ac8bf882f88080018301adb094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000001ea601ca04213ac8b4b3c33b23dd2dfda78529cb401df8f842615a619da4b37aa8038f5e7a0202463edf05016446b9da81c28cfdab638b6b38951cf125c301152b519af81a9c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ebaaecf252168ea0f4f85a5c67904afc2544cff61141a4a289b23749e79eeb4a0b2853f0fa00a44e9eff23b1551dd5b3b783233bb794ffe55cc9994731c8948baa0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a00b6ab50cb501867950261d813d5cf45c57759d0d7c0918f75079c91e8d514e00888f49450c1c0d394df882f88080018301adb094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000001ea601ca04213ac8b4b3c33b23dd2dfda78529cb401df8f842615a619da4b37aa8038f5e7a0202463edf05016446b9da81c28cfdab638b6b38951cf125c301152b519af81a9c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -181,9 +188,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb67c93f61cce9cecd496cce109a775311f1edba83f68acc4c2ca0367f55b7e40",
-        "network" : "EIP158",
+        "lastblockhash" : "0x3589eb7d53c81762321a5ed124edc5842eb679abb85c25c149b032131f6e9c91",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
                 "code" : "",
@@ -237,10 +251,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d1g0v0_Frontier" : {
+    "RevertDepthCreateOOG_d1g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -252,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x6b700e62bc1272c6a2f60d0755200d539dee6c88cd92ba135db4a10e7618af78",
-                    "mixHash" : "0x8e10c3c08550c38a884a448cd76602e2e2214297f00a13cdf11b26eea4eb1409",
-                    "nonce" : "0x0ec7ba94bdd6d547",
+                    "hash" : "0x5e605027db07b193f20df844c19e3fbf05524d162b8b79f3e8ded45cff21cdf7",
+                    "mixHash" : "0x5fcab8101ceb701debcce55de200c0076ab22050bc8e1ebd5ba0ceb0a34304ed",
+                    "nonce" : "0xb6f9ed58d045c665",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
                     "receiptTrie" : "0x6338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52",
@@ -263,7 +277,7 @@
                     "transactionsTrie" : "0xb2853f0fa00a44e9eff23b1551dd5b3b783233bb794ffe55cc9994731c8948ba",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a0b2853f0fa00a44e9eff23b1551dd5b3b783233bb794ffe55cc9994731c8948baa06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a08e10c3c08550c38a884a448cd76602e2e2214297f00a13cdf11b26eea4eb1409880ec7ba94bdd6d547f882f88080018301adb094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000001ea601ca04213ac8b4b3c33b23dd2dfda78529cb401df8f842615a619da4b37aa8038f5e7a0202463edf05016446b9da81c28cfdab638b6b38951cf125c301152b519af81a9c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a0b2853f0fa00a44e9eff23b1551dd5b3b783233bb794ffe55cc9994731c8948baa06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a05fcab8101ceb701debcce55de200c0076ab22050bc8e1ebd5ba0ceb0a34304ed88b6f9ed58d045c665f882f88080018301adb094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000001ea601ca04213ac8b4b3c33b23dd2dfda78529cb401df8f842615a619da4b37aa8038f5e7a0202463edf05016446b9da81c28cfdab638b6b38951cf125c301152b519af81a9c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -300,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6b700e62bc1272c6a2f60d0755200d539dee6c88cd92ba135db4a10e7618af78",
-        "network" : "Frontier",
+        "lastblockhash" : "0x5e605027db07b193f20df844c19e3fbf05524d162b8b79f3e8ded45cff21cdf7",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
@@ -356,10 +370,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d1g0v0_Homestead" : {
+    "RevertDepthCreateOOG_d1g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -371,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x8a1961454c089b04c662f33036f03ce64220a6ab6ff08dad641d6ca2ba90eba3",
-                    "mixHash" : "0x92c3d6aad192305579705ec0f27a291d1a5f7ef22bc0b130e26809c23f5d1e22",
-                    "nonce" : "0xa6f19ae8570aba23",
+                    "hash" : "0x1218d50e72b6d4c75bc9d5cbe176c4f4003451a2f7d3b63964d39b15b6205d00",
+                    "mixHash" : "0xd55c0937e10bbfce455c44f0893065e139c1bd07512d27c4dc6579caf3ee415f",
+                    "nonce" : "0x4a23a77bad7c5b17",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
                     "receiptTrie" : "0x6338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52",
@@ -382,7 +396,7 @@
                     "transactionsTrie" : "0xb2853f0fa00a44e9eff23b1551dd5b3b783233bb794ffe55cc9994731c8948ba",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a0b2853f0fa00a44e9eff23b1551dd5b3b783233bb794ffe55cc9994731c8948baa06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a092c3d6aad192305579705ec0f27a291d1a5f7ef22bc0b130e26809c23f5d1e2288a6f19ae8570aba23f882f88080018301adb094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000001ea601ca04213ac8b4b3c33b23dd2dfda78529cb401df8f842615a619da4b37aa8038f5e7a0202463edf05016446b9da81c28cfdab638b6b38951cf125c301152b519af81a9c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a0b2853f0fa00a44e9eff23b1551dd5b3b783233bb794ffe55cc9994731c8948baa06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0d55c0937e10bbfce455c44f0893065e139c1bd07512d27c4dc6579caf3ee415f884a23a77bad7c5b17f882f88080018301adb094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000001ea601ca04213ac8b4b3c33b23dd2dfda78529cb401df8f842615a619da4b37aa8038f5e7a0202463edf05016446b9da81c28cfdab638b6b38951cf125c301152b519af81a9c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -419,8 +433,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8a1961454c089b04c662f33036f03ce64220a6ab6ff08dad641d6ca2ba90eba3",
-        "network" : "Homestead",
+        "lastblockhash" : "0x1218d50e72b6d4c75bc9d5cbe176c4f4003451a2f7d3b63964d39b15b6205d00",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
@@ -475,10 +489,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d1g0v0_Metropolis" : {
+    "RevertDepthCreateOOG_d1g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -490,18 +504,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x11bac974a7e30e9b7606606a98646d1078fe771f36075747b117329468ab25bc",
-                    "mixHash" : "0x645574e91e8a4b131ca8727e220bc2fe0b69acb298580f67da323aa628355daa",
-                    "nonce" : "0x1c5a5c5e99f435c2",
+                    "hash" : "0x5b033bbd5c985779a0a02faef69469d3c6177a7346a6e597f5bb27216a7afc75",
+                    "mixHash" : "0x98f019eef902cce62eefa1389931f490206ac03395ce2bc9f5528a19c913f438",
+                    "nonce" : "0xe7f0f0b525a55187",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
-                    "stateRoot" : "0x6ebaaecf252168ea0f4f85a5c67904afc2544cff61141a4a289b23749e79eeb4",
+                    "receiptTrie" : "0x6338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52",
+                    "stateRoot" : "0xb29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb2853f0fa00a44e9eff23b1551dd5b3b783233bb794ffe55cc9994731c8948ba",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ebaaecf252168ea0f4f85a5c67904afc2544cff61141a4a289b23749e79eeb4a0b2853f0fa00a44e9eff23b1551dd5b3b783233bb794ffe55cc9994731c8948baa0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0645574e91e8a4b131ca8727e220bc2fe0b69acb298580f67da323aa628355daa881c5a5c5e99f435c2f882f88080018301adb094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000001ea601ca04213ac8b4b3c33b23dd2dfda78529cb401df8f842615a619da4b37aa8038f5e7a0202463edf05016446b9da81c28cfdab638b6b38951cf125c301152b519af81a9c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a0b2853f0fa00a44e9eff23b1551dd5b3b783233bb794ffe55cc9994731c8948baa06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a098f019eef902cce62eefa1389931f490206ac03395ce2bc9f5528a19c913f43888e7f0f0b525a55187f882f88080018301adb094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000001ea601ca04213ac8b4b3c33b23dd2dfda78529cb401df8f842615a619da4b37aa8038f5e7a0202463edf05016446b9da81c28cfdab638b6b38951cf125c301152b519af81a9c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -538,16 +552,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x11bac974a7e30e9b7606606a98646d1078fe771f36075747b117329468ab25bc",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x5b033bbd5c985779a0a02faef69469d3c6177a7346a6e597f5bb27216a7afc75",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5adb0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a36250",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertDepthCreateOOG_d1g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d1g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x2edf83a3bc72741a600472aa0a4c4d13d6da33eb445d27221888f20423b78e83",
+                    "mixHash" : "0x9bdd0b77aa79ccf94878e9424649c2c6f931dd28aaf77d55ea3aa2b4e81237fb",
+                    "nonce" : "0x1fd530729bc0099e",
+                    "number" : "0x01",
+                    "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
+                    "receiptTrie" : "0x6338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52",
+                    "stateRoot" : "0xb29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb2853f0fa00a44e9eff23b1551dd5b3b783233bb794ffe55cc9994731c8948ba",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a0b2853f0fa00a44e9eff23b1551dd5b3b783233bb794ffe55cc9994731c8948baa06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a09bdd0b77aa79ccf94878e9424649c2c6f931dd28aaf77d55ea3aa2b4e81237fb881fd530729bc0099ef882f88080018301adb094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000001ea601ca04213ac8b4b3c33b23dd2dfda78529cb401df8f842615a619da4b37aa8038f5e7a0202463edf05016446b9da81c28cfdab638b6b38951cf125c301152b519af81a9c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4213ac8b4b3c33b23dd2dfda78529cb401df8f842615a619da4b37aa8038f5e7",
+                        "s" : "0x202463edf05016446b9da81c28cfdab638b6b38951cf125c301152b519af81a9",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2edf83a3bc72741a600472aa0a4c4d13d6da33eb445d27221888f20423b78e83",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d1g0v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d1g0v1.json
index bafd9867a..e75c89213 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d1g0v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d1g0v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertDepthCreateOOG_d1g0v1_EIP150" : {
+    "RevertDepthCreateOOG_d1g0v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d1g0v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x4e5ad11b79f0da1ffcc219cdffd9b5ca4ee0542c1db12ea64c1c4b428a0996eb",
-                    "mixHash" : "0xeffcb0826ead4c674b8a7ffe566bac905eccdaef537987a4746f080d886f20b7",
-                    "nonce" : "0x017673965ddd714f",
+                    "hash" : "0x34456844221a11e2f48109813a644815ba860690b71e34da0dbcefba1da45a10",
+                    "mixHash" : "0xf121af26ab55602fb124dc2c2a0b9cd74e833cf52977c93d600bcbbc5ba2a9d2",
+                    "nonce" : "0x860e676f24ed1f9a",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0x6338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52",
-                    "stateRoot" : "0xb29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x6ebaaecf252168ea0f4f85a5c67904afc2544cff61141a4a289b23749e79eeb4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0180f7c1c111319fb622f71f0120c7cb9dc897492278d601c8e6593f9a8a550f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a00180f7c1c111319fb622f71f0120c7cb9dc897492278d601c8e6593f9a8a550fa06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0effcb0826ead4c674b8a7ffe566bac905eccdaef537987a4746f080d886f20b788017673965ddd714ff882f88080018301adb094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000001ea601ba0ff491c0b7f31cf86760aa16bf5f085bb5447072c803bfbe33d896e2d187d1400a020655025796a72c2ca449a0101799b0f4fcbe374a7f4c9c1e205b5f418b86f64c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ebaaecf252168ea0f4f85a5c67904afc2544cff61141a4a289b23749e79eeb4a00180f7c1c111319fb622f71f0120c7cb9dc897492278d601c8e6593f9a8a550fa0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0f121af26ab55602fb124dc2c2a0b9cd74e833cf52977c93d600bcbbc5ba2a9d288860e676f24ed1f9af882f88080018301adb094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000001ea601ba0ff491c0b7f31cf86760aa16bf5f085bb5447072c803bfbe33d896e2d187d1400a020655025796a72c2ca449a0101799b0f4fcbe374a7f4c9c1e205b5f418b86f64c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4e5ad11b79f0da1ffcc219cdffd9b5ca4ee0542c1db12ea64c1c4b428a0996eb",
-        "network" : "EIP150",
+        "lastblockhash" : "0x34456844221a11e2f48109813a644815ba860690b71e34da0dbcefba1da45a10",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
                 "code" : "",
@@ -118,10 +125,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d1g0v1_EIP158" : {
+    "RevertDepthCreateOOG_d1g0v1_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d1g0v1Filler.json"
         },
         "blocks" : [
@@ -133,18 +140,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0x8c99ef11aecdccafcc9232a07f5b9dbae91a66a5d1b4bb786c55c25ce83c56bc",
-                    "mixHash" : "0x2c847eaae17dcf15db0fa19b032ea10eea45758c2112f79156f84f2cf9b7851f",
-                    "nonce" : "0x99cabf51242c0506",
+                    "hash" : "0x38c3c2bd1a87b0325caa98264b1a6eeab8b75034f726ed73c5c24f03f6274fa1",
+                    "mixHash" : "0xdf54ba871e689f96df99082fb73de456ad8f1bb53cc3ff20691582bb85807ec8",
+                    "nonce" : "0x09be50f2a3601ef9",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0x6338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52",
-                    "stateRoot" : "0xb29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439",
+                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
+                    "stateRoot" : "0x6ebaaecf252168ea0f4f85a5c67904afc2544cff61141a4a289b23749e79eeb4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0180f7c1c111319fb622f71f0120c7cb9dc897492278d601c8e6593f9a8a550f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a00180f7c1c111319fb622f71f0120c7cb9dc897492278d601c8e6593f9a8a550fa06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a02c847eaae17dcf15db0fa19b032ea10eea45758c2112f79156f84f2cf9b7851f8899cabf51242c0506f882f88080018301adb094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000001ea601ba0ff491c0b7f31cf86760aa16bf5f085bb5447072c803bfbe33d896e2d187d1400a020655025796a72c2ca449a0101799b0f4fcbe374a7f4c9c1e205b5f418b86f64c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ebaaecf252168ea0f4f85a5c67904afc2544cff61141a4a289b23749e79eeb4a00180f7c1c111319fb622f71f0120c7cb9dc897492278d601c8e6593f9a8a550fa0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0df54ba871e689f96df99082fb73de456ad8f1bb53cc3ff20691582bb85807ec88809be50f2a3601ef9f882f88080018301adb094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000001ea601ba0ff491c0b7f31cf86760aa16bf5f085bb5447072c803bfbe33d896e2d187d1400a020655025796a72c2ca449a0101799b0f4fcbe374a7f4c9c1e205b5f418b86f64c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -181,9 +188,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8c99ef11aecdccafcc9232a07f5b9dbae91a66a5d1b4bb786c55c25ce83c56bc",
-        "network" : "EIP158",
+        "lastblockhash" : "0x38c3c2bd1a87b0325caa98264b1a6eeab8b75034f726ed73c5c24f03f6274fa1",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
                 "code" : "",
@@ -237,10 +251,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d1g0v1_Frontier" : {
+    "RevertDepthCreateOOG_d1g0v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d1g0v1Filler.json"
         },
         "blocks" : [
@@ -252,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0xaf9b9ffc4e85ec8106ef1d5d383954b5e46ba3c08f47e669401f98c2440e71fa",
-                    "mixHash" : "0x313cd5db32f458eead50b1c6e7e6df5bbd4efce203704e92061a231d09fe912a",
-                    "nonce" : "0xf332c0eeb50dcaf4",
+                    "hash" : "0x4675517d23f4315f00e8ebcdd6f1e06a3da1cb230abf79bcc97d67ca7c07e8d2",
+                    "mixHash" : "0xbf70b8c15d16bdb810aa9e9730e52ce3752fc47438d6125705b4683211729860",
+                    "nonce" : "0x4ea04cfa6fffbb9d",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
                     "receiptTrie" : "0x6338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52",
@@ -263,7 +277,7 @@
                     "transactionsTrie" : "0x0180f7c1c111319fb622f71f0120c7cb9dc897492278d601c8e6593f9a8a550f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a00180f7c1c111319fb622f71f0120c7cb9dc897492278d601c8e6593f9a8a550fa06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0313cd5db32f458eead50b1c6e7e6df5bbd4efce203704e92061a231d09fe912a88f332c0eeb50dcaf4f882f88080018301adb094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000001ea601ba0ff491c0b7f31cf86760aa16bf5f085bb5447072c803bfbe33d896e2d187d1400a020655025796a72c2ca449a0101799b0f4fcbe374a7f4c9c1e205b5f418b86f64c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a00180f7c1c111319fb622f71f0120c7cb9dc897492278d601c8e6593f9a8a550fa06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0bf70b8c15d16bdb810aa9e9730e52ce3752fc47438d6125705b4683211729860884ea04cfa6fffbb9df882f88080018301adb094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000001ea601ba0ff491c0b7f31cf86760aa16bf5f085bb5447072c803bfbe33d896e2d187d1400a020655025796a72c2ca449a0101799b0f4fcbe374a7f4c9c1e205b5f418b86f64c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -300,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaf9b9ffc4e85ec8106ef1d5d383954b5e46ba3c08f47e669401f98c2440e71fa",
-        "network" : "Frontier",
+        "lastblockhash" : "0x4675517d23f4315f00e8ebcdd6f1e06a3da1cb230abf79bcc97d67ca7c07e8d2",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
@@ -356,10 +370,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d1g0v1_Homestead" : {
+    "RevertDepthCreateOOG_d1g0v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d1g0v1Filler.json"
         },
         "blocks" : [
@@ -371,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0xcf7d6f09a51d97a9435b23b827468feaf807e75791d876152ee22023a71e13fd",
-                    "mixHash" : "0x7647f2ccb5076d8dcfb2eebfc38e9b883ecf1436928c32dcb11c5ec0926c1d1f",
-                    "nonce" : "0x25ff74788aa94ee9",
+                    "hash" : "0xb9f4df0973c25fa6a7290b637102bdd8b0aa2acd34e1f6a598bf6f3f3d57fa38",
+                    "mixHash" : "0xd5fb128fff3e2f2db1387fc61edb161648bd95fd6e911967ba86206e94a012a2",
+                    "nonce" : "0xd142087aa15192e7",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
                     "receiptTrie" : "0x6338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52",
@@ -382,7 +396,7 @@
                     "transactionsTrie" : "0x0180f7c1c111319fb622f71f0120c7cb9dc897492278d601c8e6593f9a8a550f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a00180f7c1c111319fb622f71f0120c7cb9dc897492278d601c8e6593f9a8a550fa06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a07647f2ccb5076d8dcfb2eebfc38e9b883ecf1436928c32dcb11c5ec0926c1d1f8825ff74788aa94ee9f882f88080018301adb094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000001ea601ba0ff491c0b7f31cf86760aa16bf5f085bb5447072c803bfbe33d896e2d187d1400a020655025796a72c2ca449a0101799b0f4fcbe374a7f4c9c1e205b5f418b86f64c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a00180f7c1c111319fb622f71f0120c7cb9dc897492278d601c8e6593f9a8a550fa06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0d5fb128fff3e2f2db1387fc61edb161648bd95fd6e911967ba86206e94a012a288d142087aa15192e7f882f88080018301adb094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000001ea601ba0ff491c0b7f31cf86760aa16bf5f085bb5447072c803bfbe33d896e2d187d1400a020655025796a72c2ca449a0101799b0f4fcbe374a7f4c9c1e205b5f418b86f64c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -419,8 +433,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf7d6f09a51d97a9435b23b827468feaf807e75791d876152ee22023a71e13fd",
-        "network" : "Homestead",
+        "lastblockhash" : "0xb9f4df0973c25fa6a7290b637102bdd8b0aa2acd34e1f6a598bf6f3f3d57fa38",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
@@ -475,10 +489,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d1g0v1_Metropolis" : {
+    "RevertDepthCreateOOG_d1g0v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d1g0v1Filler.json"
         },
         "blocks" : [
@@ -490,18 +504,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01adb0",
-                    "hash" : "0xf2999d6a8e7011fee42bf30deb69907647555abc03257497ba7126463600dc81",
-                    "mixHash" : "0x551fdfc6629392ed6078a6ed112c9bad477e06866c804aa77cc31f475b8f4e4b",
-                    "nonce" : "0xdf6ed1d9afc0e7f4",
+                    "hash" : "0x563fc3955d1e51d68ad7cdc8e33b111fb3741805a91fee7c482a1f113355c775",
+                    "mixHash" : "0x9509aa081c9e119560526fd910f502711d0b5f1fa7c23ed374c73d4ff96bec4c",
+                    "nonce" : "0x1cb281788158c125",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0xfd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3",
-                    "stateRoot" : "0x6ebaaecf252168ea0f4f85a5c67904afc2544cff61141a4a289b23749e79eeb4",
+                    "receiptTrie" : "0x6338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52",
+                    "stateRoot" : "0xb29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0180f7c1c111319fb622f71f0120c7cb9dc897492278d601c8e6593f9a8a550f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ebaaecf252168ea0f4f85a5c67904afc2544cff61141a4a289b23749e79eeb4a00180f7c1c111319fb622f71f0120c7cb9dc897492278d601c8e6593f9a8a550fa0fd21849a7839c2c75da6c5f2828e953f017b356f3e968aba1a97ac6f6c5b31f3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a0551fdfc6629392ed6078a6ed112c9bad477e06866c804aa77cc31f475b8f4e4b88df6ed1d9afc0e7f4f882f88080018301adb094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000001ea601ba0ff491c0b7f31cf86760aa16bf5f085bb5447072c803bfbe33d896e2d187d1400a020655025796a72c2ca449a0101799b0f4fcbe374a7f4c9c1e205b5f418b86f64c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a00180f7c1c111319fb622f71f0120c7cb9dc897492278d601c8e6593f9a8a550fa06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a09509aa081c9e119560526fd910f502711d0b5f1fa7c23ed374c73d4ff96bec4c881cb281788158c125f882f88080018301adb094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000001ea601ba0ff491c0b7f31cf86760aa16bf5f085bb5447072c803bfbe33d896e2d187d1400a020655025796a72c2ca449a0101799b0f4fcbe374a7f4c9c1e205b5f418b86f64c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -538,16 +552,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf2999d6a8e7011fee42bf30deb69907647555abc03257497ba7126463600dc81",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x563fc3955d1e51d68ad7cdc8e33b111fb3741805a91fee7c482a1f113355c775",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5adb0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a36250",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertDepthCreateOOG_d1g0v1_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d1g0v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01adb0",
+                    "hash" : "0x947d4ffb0d8c1c4540ac5cc8d0450f81ccd2c07406c6ed2fee682d21c7a5bcc4",
+                    "mixHash" : "0x2b2b5a19ec13f5e55a3ecaf4565ac575ad51d75e7a6ee102b0f0e513825a8d35",
+                    "nonce" : "0xbe5bf5168100ab40",
+                    "number" : "0x01",
+                    "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
+                    "receiptTrie" : "0x6338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52",
+                    "stateRoot" : "0xb29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0180f7c1c111319fb622f71f0120c7cb9dc897492278d601c8e6593f9a8a550f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29b906a82c1f3fdb96fca94a9539c7e2fbf4aa7c6969381c02df944242df439a00180f7c1c111319fb622f71f0120c7cb9dc897492278d601c8e6593f9a8a550fa06338d9e14a320830c5ce0833ec8c26ea118514446ec6f884605bdc83d5e30d52b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301adb08203e880a02b2b5a19ec13f5e55a3ecaf4565ac575ad51d75e7a6ee102b0f0e513825a8d3588be5bf5168100ab40f882f88080018301adb094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000001ea601ba0ff491c0b7f31cf86760aa16bf5f085bb5447072c803bfbe33d896e2d187d1400a020655025796a72c2ca449a0101799b0f4fcbe374a7f4c9c1e205b5f418b86f64c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xff491c0b7f31cf86760aa16bf5f085bb5447072c803bfbe33d896e2d187d1400",
+                        "s" : "0x20655025796a72c2ca449a0101799b0f4fcbe374a7f4c9c1e205b5f418b86f64",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x947d4ffb0d8c1c4540ac5cc8d0450f81ccd2c07406c6ed2fee682d21c7a5bcc4",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5adb0",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d1g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d1g1v0.json
index 5a53b6c22..1e4b60a99 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d1g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d1g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertDepthCreateOOG_d1g1v0_EIP150" : {
+    "RevertDepthCreateOOG_d1g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0259e2",
-                    "hash" : "0x0dc8b90ada1941616e8a30e50b0da6cded2926ff134a4c4f52719f9f7e5e8931",
-                    "mixHash" : "0x20dcc0a647b9868739897352e6de6cd6967340d2abcad81cb50f539723f52aaf",
-                    "nonce" : "0x1dcf7efc8a4ebb83",
+                    "hash" : "0x9cb12c476a70b109ed1f03a492b6808ad9035fc587b6cf32c4289de1a0a1bc74",
+                    "mixHash" : "0x34df209feb7d8dfacdd2b78ee0f7f3356cf90aa26c36ebdbfd3861f373314c82",
+                    "nonce" : "0x83c758be56678a0f",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0x018e234a054d1875b545397b1c1b9e86bd3c0f9dc559db444017d3d151639d46",
-                    "stateRoot" : "0x4b40a85e25d7860f8e76ba408eebc9dad2c9b2cc04792988e4311b7c43f6e7a9",
+                    "receiptTrie" : "0x1e4134e4cb2f1fe1fd6582225bcf81c6a06f48432112f70c794cc859d39fa735",
+                    "stateRoot" : "0x74f9b1d815fb7666bd8e76a2c6175b206aaa250c800f7818b045b76429138230",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5bd7c5e4bbfe38bf34547d64dc228171037602f027519a1dfb5e49645648cb7f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b40a85e25d7860f8e76ba408eebc9dad2c9b2cc04792988e4311b7c43f6e7a9a05bd7c5e4bbfe38bf34547d64dc228171037602f027519a1dfb5e49645648cb7fa0018e234a054d1875b545397b1c1b9e86bd3c0f9dc559db444017d3d151639d46b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a020dcc0a647b9868739897352e6de6cd6967340d2abcad81cb50f539723f52aaf881dcf7efc8a4ebb83f882f88080018302710094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000001ea601ca06abcc24a73e8c086ceac2e7390723203706e53aa49f5fb02fca5a7030a98d1d8a00767a5bd2c4b3fac4eaf3bcb4a831ee717ec34e1b763df99cf11d4c298a0e9dfc0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074f9b1d815fb7666bd8e76a2c6175b206aaa250c800f7818b045b76429138230a05bd7c5e4bbfe38bf34547d64dc228171037602f027519a1dfb5e49645648cb7fa01e4134e4cb2f1fe1fd6582225bcf81c6a06f48432112f70c794cc859d39fa735b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a034df209feb7d8dfacdd2b78ee0f7f3356cf90aa26c36ebdbfd3861f373314c828883c758be56678a0ff882f88080018302710094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000001ea601ca06abcc24a73e8c086ceac2e7390723203706e53aa49f5fb02fca5a7030a98d1d8a00767a5bd2c4b3fac4eaf3bcb4a831ee717ec34e1b763df99cf11d4c298a0e9dfc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0dc8b90ada1941616e8a30e50b0da6cded2926ff134a4c4f52719f9f7e5e8931",
-        "network" : "EIP150",
+        "lastblockhash" : "0x9cb12c476a70b109ed1f03a492b6808ad9035fc587b6cf32c4289de1a0a1bc74",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f659e2",
                 "code" : "",
@@ -75,7 +82,7 @@
             "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             },
@@ -130,10 +137,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d1g1v0_EIP158" : {
+    "RevertDepthCreateOOG_d1g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -145,18 +152,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0259e2",
-                    "hash" : "0x8c03cd4d69649eda718ab6b1dc25ba2a4b731dd945b4428dd27ba41f74c9bf04",
-                    "mixHash" : "0x56f7433f8b15b2bfc9a114779bcb9f578e0ba43c3f4d0ff6992b7d8ba8ef3265",
-                    "nonce" : "0x9632ce653c337a81",
+                    "hash" : "0xf687c535d9bea3e07afb3c7366dcb6e2d86d741f547b111cf4da151b4d4e76db",
+                    "mixHash" : "0xf5e9efd2e9dd6fa38332047a3008a12ace7aa4caa3d356a1dfcd8c2269690211",
+                    "nonce" : "0x07d85cf8e590a14f",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0x355a12419919fe7db330b20055167d9d5b75bcd74076db3e6ea09ca7de2aaef0",
-                    "stateRoot" : "0x2f94121485d7a37c6a20f4f8b2d8932f45194407efbd1258c21438ec33f7b451",
+                    "receiptTrie" : "0x1e4134e4cb2f1fe1fd6582225bcf81c6a06f48432112f70c794cc859d39fa735",
+                    "stateRoot" : "0x74f9b1d815fb7666bd8e76a2c6175b206aaa250c800f7818b045b76429138230",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5bd7c5e4bbfe38bf34547d64dc228171037602f027519a1dfb5e49645648cb7f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f94121485d7a37c6a20f4f8b2d8932f45194407efbd1258c21438ec33f7b451a05bd7c5e4bbfe38bf34547d64dc228171037602f027519a1dfb5e49645648cb7fa0355a12419919fe7db330b20055167d9d5b75bcd74076db3e6ea09ca7de2aaef0b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a056f7433f8b15b2bfc9a114779bcb9f578e0ba43c3f4d0ff6992b7d8ba8ef3265889632ce653c337a81f882f88080018302710094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000001ea601ca06abcc24a73e8c086ceac2e7390723203706e53aa49f5fb02fca5a7030a98d1d8a00767a5bd2c4b3fac4eaf3bcb4a831ee717ec34e1b763df99cf11d4c298a0e9dfc0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074f9b1d815fb7666bd8e76a2c6175b206aaa250c800f7818b045b76429138230a05bd7c5e4bbfe38bf34547d64dc228171037602f027519a1dfb5e49645648cb7fa01e4134e4cb2f1fe1fd6582225bcf81c6a06f48432112f70c794cc859d39fa735b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a0f5e9efd2e9dd6fa38332047a3008a12ace7aa4caa3d356a1dfcd8c22696902118807d85cf8e590a14ff882f88080018302710094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000001ea601ca06abcc24a73e8c086ceac2e7390723203706e53aa49f5fb02fca5a7030a98d1d8a00767a5bd2c4b3fac4eaf3bcb4a831ee717ec34e1b763df99cf11d4c298a0e9dfc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -193,9 +200,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8c03cd4d69649eda718ab6b1dc25ba2a4b731dd945b4428dd27ba41f74c9bf04",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf687c535d9bea3e07afb3c7366dcb6e2d86d741f547b111cf4da151b4d4e76db",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f659e2",
                 "code" : "",
@@ -261,10 +275,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d1g1v0_Frontier" : {
+    "RevertDepthCreateOOG_d1g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -275,19 +289,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x027100",
-                    "hash" : "0x0afdc551987a320ee68622d7a8a431cb2808f487225a4f20300d32b222a248a2",
-                    "mixHash" : "0xe4fd856880176b79c05ea3d4b19dde4402e91ddbe52f8cde5bb3d87ae2fe5eb6",
-                    "nonce" : "0x560f995a060d04c6",
+                    "gasUsed" : "0x0259e2",
+                    "hash" : "0x7f264c3c2ff628e6d894fabbbf7c90eb37000bd5244d7e99902864d799b1c57e",
+                    "mixHash" : "0x1db612d60ad2c9ca820e9b728b624e29090ae1ffc88e59fdc086b121eec6c619",
+                    "nonce" : "0x548970c373a65a93",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0x7302b20be0e6be0c3ca557e680a2811ba880cb20c0c5dc97e8c50183f027bc6d",
-                    "stateRoot" : "0x2b1b4d528a9b115bb5a186ca91b485ff2ef50bef0a0fe1de65c83cdd4e6b066b",
+                    "receiptTrie" : "0x018e234a054d1875b545397b1c1b9e86bd3c0f9dc559db444017d3d151639d46",
+                    "stateRoot" : "0x4b40a85e25d7860f8e76ba408eebc9dad2c9b2cc04792988e4311b7c43f6e7a9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5bd7c5e4bbfe38bf34547d64dc228171037602f027519a1dfb5e49645648cb7f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b1b4d528a9b115bb5a186ca91b485ff2ef50bef0a0fe1de65c83cdd4e6b066ba05bd7c5e4bbfe38bf34547d64dc228171037602f027519a1dfb5e49645648cb7fa07302b20be0e6be0c3ca557e680a2811ba880cb20c0c5dc97e8c50183f027bc6db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0e4fd856880176b79c05ea3d4b19dde4402e91ddbe52f8cde5bb3d87ae2fe5eb688560f995a060d04c6f882f88080018302710094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000001ea601ca06abcc24a73e8c086ceac2e7390723203706e53aa49f5fb02fca5a7030a98d1d8a00767a5bd2c4b3fac4eaf3bcb4a831ee717ec34e1b763df99cf11d4c298a0e9dfc0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b40a85e25d7860f8e76ba408eebc9dad2c9b2cc04792988e4311b7c43f6e7a9a05bd7c5e4bbfe38bf34547d64dc228171037602f027519a1dfb5e49645648cb7fa0018e234a054d1875b545397b1c1b9e86bd3c0f9dc559db444017d3d151639d46b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a01db612d60ad2c9ca820e9b728b624e29090ae1ffc88e59fdc086b121eec6c61988548970c373a65a93f882f88080018302710094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000001ea601ca06abcc24a73e8c086ceac2e7390723203706e53aa49f5fb02fca5a7030a98d1d8a00767a5bd2c4b3fac4eaf3bcb4a831ee717ec34e1b763df99cf11d4c298a0e9dfc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -324,25 +338,35 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0afdc551987a320ee68622d7a8a431cb2808f487225a4f20300d32b222a248a2",
-        "network" : "Frontier",
+        "lastblockhash" : "0x7f264c3c2ff628e6d894fabbbf7c90eb37000bd5244d7e99902864d799b1c57e",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f67100",
+                "balance" : "0x4563918244f659e2",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa000000000000000000000000000000000000000" : {
-                "balance" : "0x05",
+                "balance" : "0x06",
                 "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
                 "nonce" : "0x36",
                 "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x04" : "0x0c"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a29f00",
+                "balance" : "0xe8d4a2b61d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -351,8 +375,10 @@
             "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6008600255600060006000f050600c600355",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
+                    "0x02" : "0x08",
+                    "0x03" : "0x0c"
                 }
             }
         },
@@ -380,10 +406,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d1g1v0_Homestead" : {
+    "RevertDepthCreateOOG_d1g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -394,19 +420,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x027100",
-                    "hash" : "0xd8869887bf374e19b40d02a859e79f9b0ed368b40efe8cebe3d517c49b52e279",
-                    "mixHash" : "0xa7f34a59d1d91fd59c4d97cd23d8e6591c1b3adc6c49e401554ad69245cdc001",
-                    "nonce" : "0x0ffba4cc6bcf09f5",
+                    "gasUsed" : "0x0259e2",
+                    "hash" : "0xea60f67cb2ab73def47f100755983cd4656b2945f4c5b1ee25bb1f1df8c6a4f3",
+                    "mixHash" : "0x5c0b06f4c18866739c12a42285bba31e4a2bf95731cb9d96abc404e2ce2ed61c",
+                    "nonce" : "0x684a04d2fa906f97",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0x7302b20be0e6be0c3ca557e680a2811ba880cb20c0c5dc97e8c50183f027bc6d",
-                    "stateRoot" : "0x2b1b4d528a9b115bb5a186ca91b485ff2ef50bef0a0fe1de65c83cdd4e6b066b",
+                    "receiptTrie" : "0x355a12419919fe7db330b20055167d9d5b75bcd74076db3e6ea09ca7de2aaef0",
+                    "stateRoot" : "0x2f94121485d7a37c6a20f4f8b2d8932f45194407efbd1258c21438ec33f7b451",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5bd7c5e4bbfe38bf34547d64dc228171037602f027519a1dfb5e49645648cb7f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b1b4d528a9b115bb5a186ca91b485ff2ef50bef0a0fe1de65c83cdd4e6b066ba05bd7c5e4bbfe38bf34547d64dc228171037602f027519a1dfb5e49645648cb7fa07302b20be0e6be0c3ca557e680a2811ba880cb20c0c5dc97e8c50183f027bc6db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0a7f34a59d1d91fd59c4d97cd23d8e6591c1b3adc6c49e401554ad69245cdc001880ffba4cc6bcf09f5f882f88080018302710094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000001ea601ca06abcc24a73e8c086ceac2e7390723203706e53aa49f5fb02fca5a7030a98d1d8a00767a5bd2c4b3fac4eaf3bcb4a831ee717ec34e1b763df99cf11d4c298a0e9dfc0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f94121485d7a37c6a20f4f8b2d8932f45194407efbd1258c21438ec33f7b451a05bd7c5e4bbfe38bf34547d64dc228171037602f027519a1dfb5e49645648cb7fa0355a12419919fe7db330b20055167d9d5b75bcd74076db3e6ea09ca7de2aaef0b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a05c0b06f4c18866739c12a42285bba31e4a2bf95731cb9d96abc404e2ce2ed61c88684a04d2fa906f97f882f88080018302710094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000001ea601ca06abcc24a73e8c086ceac2e7390723203706e53aa49f5fb02fca5a7030a98d1d8a00767a5bd2c4b3fac4eaf3bcb4a831ee717ec34e1b763df99cf11d4c298a0e9dfc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -443,25 +469,35 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd8869887bf374e19b40d02a859e79f9b0ed368b40efe8cebe3d517c49b52e279",
-        "network" : "Homestead",
+        "lastblockhash" : "0xea60f67cb2ab73def47f100755983cd4656b2945f4c5b1ee25bb1f1df8c6a4f3",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f67100",
+                "balance" : "0x4563918244f659e2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
             "0xa000000000000000000000000000000000000000" : {
-                "balance" : "0x05",
+                "balance" : "0x06",
                 "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
                 "nonce" : "0x36",
                 "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x04" : "0x0c"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a29f00",
+                "balance" : "0xe8d4a2b61d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -470,8 +506,10 @@
             "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6008600255600060006000f050600c600355",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
+                    "0x02" : "0x08",
+                    "0x03" : "0x0c"
                 }
             }
         },
@@ -499,10 +537,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d1g1v0_Metropolis" : {
+    "RevertDepthCreateOOG_d1g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -513,19 +551,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0259e2",
-                    "hash" : "0x1afa4505f2fdd75c7e9df255489b18dfcaf1636610a6e8c6252f2e176b764ede",
-                    "mixHash" : "0x82e8896b6e84e37a1e66ea25046dd0cb999dc4c20a96db8c13732d64a85699fa",
-                    "nonce" : "0xd31b80e8874fbc86",
+                    "gasUsed" : "0x027100",
+                    "hash" : "0x98e39bcd944adbfd39f39bb3797367bd9076e8c9ef6bfa6c637129009343e460",
+                    "mixHash" : "0xdae0199227ba381d7889ae20803cef3a35a1a8e8743b5e9bea357d6b50956d09",
+                    "nonce" : "0x642a502ad288c22f",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0x1e4134e4cb2f1fe1fd6582225bcf81c6a06f48432112f70c794cc859d39fa735",
-                    "stateRoot" : "0x74f9b1d815fb7666bd8e76a2c6175b206aaa250c800f7818b045b76429138230",
+                    "receiptTrie" : "0x7302b20be0e6be0c3ca557e680a2811ba880cb20c0c5dc97e8c50183f027bc6d",
+                    "stateRoot" : "0x2b1b4d528a9b115bb5a186ca91b485ff2ef50bef0a0fe1de65c83cdd4e6b066b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5bd7c5e4bbfe38bf34547d64dc228171037602f027519a1dfb5e49645648cb7f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074f9b1d815fb7666bd8e76a2c6175b206aaa250c800f7818b045b76429138230a05bd7c5e4bbfe38bf34547d64dc228171037602f027519a1dfb5e49645648cb7fa01e4134e4cb2f1fe1fd6582225bcf81c6a06f48432112f70c794cc859d39fa735b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a082e8896b6e84e37a1e66ea25046dd0cb999dc4c20a96db8c13732d64a85699fa88d31b80e8874fbc86f882f88080018302710094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000001ea601ca06abcc24a73e8c086ceac2e7390723203706e53aa49f5fb02fca5a7030a98d1d8a00767a5bd2c4b3fac4eaf3bcb4a831ee717ec34e1b763df99cf11d4c298a0e9dfc0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b1b4d528a9b115bb5a186ca91b485ff2ef50bef0a0fe1de65c83cdd4e6b066ba05bd7c5e4bbfe38bf34547d64dc228171037602f027519a1dfb5e49645648cb7fa07302b20be0e6be0c3ca557e680a2811ba880cb20c0c5dc97e8c50183f027bc6db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0dae0199227ba381d7889ae20803cef3a35a1a8e8743b5e9bea357d6b50956d0988642a502ad288c22ff882f88080018302710094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000001ea601ca06abcc24a73e8c086ceac2e7390723203706e53aa49f5fb02fca5a7030a98d1d8a00767a5bd2c4b3fac4eaf3bcb4a831ee717ec34e1b763df99cf11d4c298a0e9dfc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -562,42 +600,144 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1afa4505f2fdd75c7e9df255489b18dfcaf1636610a6e8c6252f2e176b764ede",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x98e39bcd944adbfd39f39bb3797367bd9076e8c9ef6bfa6c637129009343e460",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f67100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f659e2",
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a29f00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
+            "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertDepthCreateOOG_d1g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d1g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x027100",
+                    "hash" : "0xbbe1dd9c2fac91d822911af07158af6fddbf1e2b5119f4e7c7036405a7cef5f3",
+                    "mixHash" : "0x46afaa8ceab17b99544ab66d38de2d7b8e35b888f6907d9071dfc690ccf1836b",
+                    "nonce" : "0xd51483657f13b837",
+                    "number" : "0x01",
+                    "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
+                    "receiptTrie" : "0x7302b20be0e6be0c3ca557e680a2811ba880cb20c0c5dc97e8c50183f027bc6d",
+                    "stateRoot" : "0x2b1b4d528a9b115bb5a186ca91b485ff2ef50bef0a0fe1de65c83cdd4e6b066b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5bd7c5e4bbfe38bf34547d64dc228171037602f027519a1dfb5e49645648cb7f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b1b4d528a9b115bb5a186ca91b485ff2ef50bef0a0fe1de65c83cdd4e6b066ba05bd7c5e4bbfe38bf34547d64dc228171037602f027519a1dfb5e49645648cb7fa07302b20be0e6be0c3ca557e680a2811ba880cb20c0c5dc97e8c50183f027bc6db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a046afaa8ceab17b99544ab66d38de2d7b8e35b888f6907d9071dfc690ccf1836b88d51483657f13b837f882f88080018302710094a00000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000001ea601ca06abcc24a73e8c086ceac2e7390723203706e53aa49f5fb02fca5a7030a98d1d8a00767a5bd2c4b3fac4eaf3bcb4a831ee717ec34e1b763df99cf11d4c298a0e9dfc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
+                        "gasLimit" : "0x027100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6abcc24a73e8c086ceac2e7390723203706e53aa49f5fb02fca5a7030a98d1d8",
+                        "s" : "0x0767a5bd2c4b3fac4eaf3bcb4a831ee717ec34e1b763df99cf11d4c298a0e9df",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbbe1dd9c2fac91d822911af07158af6fddbf1e2b5119f4e7c7036405a7cef5f3",
+        "network" : "Homestead",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f67100",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa000000000000000000000000000000000000000" : {
-                "balance" : "0x06",
+                "balance" : "0x05",
                 "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
                 "nonce" : "0x36",
                 "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x04" : "0x0c"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2b61d",
+                "balance" : "0xe8d4a29f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -606,10 +746,8 @@
             "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6008600255600060006000f050600c600355",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
-                    "0x02" : "0x08",
-                    "0x03" : "0x0c"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d1g1v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d1g1v1.json
index 705780572..3867725e5 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d1g1v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepthCreateOOG_d1g1v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertDepthCreateOOG_d1g1v1_EIP150" : {
+    "RevertDepthCreateOOG_d1g1v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d1g1v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0259e2",
-                    "hash" : "0x63e4300c48e95e06bde3684753be6a5e7f6a66498d85cd21f73f8d21776d1a0e",
-                    "mixHash" : "0x6013f92df160abf71827e023fd8622991a512c44007357bcb5546fc43b1932f9",
-                    "nonce" : "0xb807506a5bfcee07",
+                    "hash" : "0x8fba32c97210892e5f1f67de0ea87e2d59cca397353ea268a727a074ecc5138f",
+                    "mixHash" : "0x116af8a608aa6ca5c871c7526c3ad25368ef9001dd14d7648ba29da6b90bc4ec",
+                    "nonce" : "0xf92cccb41bdd0bfd",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0xd20b2e66d3fa6c7801c9c79450213bde97b2ce7eac3fcfba2a2e4b8c84415167",
-                    "stateRoot" : "0x0de381a9d2c15b299692e2693b852d0ea12576e4d3c3fb961193a1ed675a4fb1",
+                    "receiptTrie" : "0x1e4134e4cb2f1fe1fd6582225bcf81c6a06f48432112f70c794cc859d39fa735",
+                    "stateRoot" : "0x0b87c1aea4aebf3a8a7797c04e628d3d204280bc09ad398e96340aca43293859",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x19cd1db37d6660bd25003bbd6f49670dc859ce8f9312f8b980c37ffc642e9578",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00de381a9d2c15b299692e2693b852d0ea12576e4d3c3fb961193a1ed675a4fb1a019cd1db37d6660bd25003bbd6f49670dc859ce8f9312f8b980c37ffc642e9578a0d20b2e66d3fa6c7801c9c79450213bde97b2ce7eac3fcfba2a2e4b8c84415167b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a06013f92df160abf71827e023fd8622991a512c44007357bcb5546fc43b1932f988b807506a5bfcee07f882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000001ea601ca037adf5d9e690d80655b2e228ce5dec27e6e41f10dbfd16575657260730cd55d1a056c879b168652d16f20c9beaafe9d483087c5a7611f03387378678058010f240c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b87c1aea4aebf3a8a7797c04e628d3d204280bc09ad398e96340aca43293859a019cd1db37d6660bd25003bbd6f49670dc859ce8f9312f8b980c37ffc642e9578a01e4134e4cb2f1fe1fd6582225bcf81c6a06f48432112f70c794cc859d39fa735b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a0116af8a608aa6ca5c871c7526c3ad25368ef9001dd14d7648ba29da6b90bc4ec88f92cccb41bdd0bfdf882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000001ea601ca037adf5d9e690d80655b2e228ce5dec27e6e41f10dbfd16575657260730cd55d1a056c879b168652d16f20c9beaafe9d483087c5a7611f03387378678058010f240c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x63e4300c48e95e06bde3684753be6a5e7f6a66498d85cd21f73f8d21776d1a0e",
-        "network" : "EIP150",
+        "lastblockhash" : "0x8fba32c97210892e5f1f67de0ea87e2d59cca397353ea268a727a074ecc5138f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f659e2",
                 "code" : "",
@@ -75,7 +82,7 @@
             "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             },
@@ -130,10 +137,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d1g1v1_EIP158" : {
+    "RevertDepthCreateOOG_d1g1v1_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d1g1v1Filler.json"
         },
         "blocks" : [
@@ -145,18 +152,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0259e2",
-                    "hash" : "0x46b631d1ca24f54939f98e7dc846f0f0fb87e94652d789ef77fdefdbb839992f",
-                    "mixHash" : "0x270766317a35ef594ce9212ebe53aabae2488337e54a77b099fca3bac6e1dddc",
-                    "nonce" : "0xc8f0a0b76f2263f3",
+                    "hash" : "0x36a76dcb28fb1c2968ca71e41515e38f0f20ebe32d493e0cee6545f252c8658d",
+                    "mixHash" : "0x1157fda0a641561bf7911d08263410c17bd55eee394b8b4bea9fe0f53a52223b",
+                    "nonce" : "0xfcd2219da6ef871c",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0x51300429a0a0288b9d1a595ef703e176a75eaa18b020c8a54926d57234d067da",
-                    "stateRoot" : "0xdfeecf53942a4ea662b7f26a8368bbe322cf5a6111621d32597638502e607c13",
+                    "receiptTrie" : "0x1e4134e4cb2f1fe1fd6582225bcf81c6a06f48432112f70c794cc859d39fa735",
+                    "stateRoot" : "0x0b87c1aea4aebf3a8a7797c04e628d3d204280bc09ad398e96340aca43293859",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x19cd1db37d6660bd25003bbd6f49670dc859ce8f9312f8b980c37ffc642e9578",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dfeecf53942a4ea662b7f26a8368bbe322cf5a6111621d32597638502e607c13a019cd1db37d6660bd25003bbd6f49670dc859ce8f9312f8b980c37ffc642e9578a051300429a0a0288b9d1a595ef703e176a75eaa18b020c8a54926d57234d067dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a0270766317a35ef594ce9212ebe53aabae2488337e54a77b099fca3bac6e1dddc88c8f0a0b76f2263f3f882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000001ea601ca037adf5d9e690d80655b2e228ce5dec27e6e41f10dbfd16575657260730cd55d1a056c879b168652d16f20c9beaafe9d483087c5a7611f03387378678058010f240c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b87c1aea4aebf3a8a7797c04e628d3d204280bc09ad398e96340aca43293859a019cd1db37d6660bd25003bbd6f49670dc859ce8f9312f8b980c37ffc642e9578a01e4134e4cb2f1fe1fd6582225bcf81c6a06f48432112f70c794cc859d39fa735b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a01157fda0a641561bf7911d08263410c17bd55eee394b8b4bea9fe0f53a52223b88fcd2219da6ef871cf882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000001ea601ca037adf5d9e690d80655b2e228ce5dec27e6e41f10dbfd16575657260730cd55d1a056c879b168652d16f20c9beaafe9d483087c5a7611f03387378678058010f240c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -193,9 +200,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x46b631d1ca24f54939f98e7dc846f0f0fb87e94652d789ef77fdefdbb839992f",
-        "network" : "EIP158",
+        "lastblockhash" : "0x36a76dcb28fb1c2968ca71e41515e38f0f20ebe32d493e0cee6545f252c8658d",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f659e2",
                 "code" : "",
@@ -261,10 +275,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d1g1v1_Frontier" : {
+    "RevertDepthCreateOOG_d1g1v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d1g1v1Filler.json"
         },
         "blocks" : [
@@ -275,19 +289,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x027100",
-                    "hash" : "0x3939eb43ef029210f2373f100357c7c49523888b48787d61ecb11504b69e1bb2",
-                    "mixHash" : "0x2a9a98f1bb5ca4aaf23298a0d1b85bbdf4ab19cb6f542e4b1aa4a331a812073d",
-                    "nonce" : "0x47aebfc88c0ba261",
+                    "gasUsed" : "0x0259e2",
+                    "hash" : "0x940e530b0571e32fa7afc66062da081a78d4e4df81922c4dc899a3e2f0c903d2",
+                    "mixHash" : "0xbfccdc13357302f636393e2ac3f1e36b4bac3f898f1ed7ad5118122d676e5377",
+                    "nonce" : "0x07de61cf7a720f2c",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0x7302b20be0e6be0c3ca557e680a2811ba880cb20c0c5dc97e8c50183f027bc6d",
-                    "stateRoot" : "0x2b1b4d528a9b115bb5a186ca91b485ff2ef50bef0a0fe1de65c83cdd4e6b066b",
+                    "receiptTrie" : "0xd20b2e66d3fa6c7801c9c79450213bde97b2ce7eac3fcfba2a2e4b8c84415167",
+                    "stateRoot" : "0x0de381a9d2c15b299692e2693b852d0ea12576e4d3c3fb961193a1ed675a4fb1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x19cd1db37d6660bd25003bbd6f49670dc859ce8f9312f8b980c37ffc642e9578",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b1b4d528a9b115bb5a186ca91b485ff2ef50bef0a0fe1de65c83cdd4e6b066ba019cd1db37d6660bd25003bbd6f49670dc859ce8f9312f8b980c37ffc642e9578a07302b20be0e6be0c3ca557e680a2811ba880cb20c0c5dc97e8c50183f027bc6db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a02a9a98f1bb5ca4aaf23298a0d1b85bbdf4ab19cb6f542e4b1aa4a331a812073d8847aebfc88c0ba261f882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000001ea601ca037adf5d9e690d80655b2e228ce5dec27e6e41f10dbfd16575657260730cd55d1a056c879b168652d16f20c9beaafe9d483087c5a7611f03387378678058010f240c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00de381a9d2c15b299692e2693b852d0ea12576e4d3c3fb961193a1ed675a4fb1a019cd1db37d6660bd25003bbd6f49670dc859ce8f9312f8b980c37ffc642e9578a0d20b2e66d3fa6c7801c9c79450213bde97b2ce7eac3fcfba2a2e4b8c84415167b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a0bfccdc13357302f636393e2ac3f1e36b4bac3f898f1ed7ad5118122d676e53778807de61cf7a720f2cf882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000001ea601ca037adf5d9e690d80655b2e228ce5dec27e6e41f10dbfd16575657260730cd55d1a056c879b168652d16f20c9beaafe9d483087c5a7611f03387378678058010f240c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -324,11 +338,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3939eb43ef029210f2373f100357c7c49523888b48787d61ecb11504b69e1bb2",
-        "network" : "Frontier",
+        "lastblockhash" : "0x940e530b0571e32fa7afc66062da081a78d4e4df81922c4dc899a3e2f0c903d2",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f67100",
+                "balance" : "0x4563918244f659e2",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -339,10 +360,13 @@
                 "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
                 "nonce" : "0x36",
                 "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x04" : "0x0c"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a29f00",
+                "balance" : "0xe8d4a2b61e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -351,8 +375,10 @@
             "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6008600255600060006000f050600c600355",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
+                    "0x02" : "0x08",
+                    "0x03" : "0x0c"
                 }
             }
         },
@@ -380,10 +406,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d1g1v1_Homestead" : {
+    "RevertDepthCreateOOG_d1g1v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d1g1v1Filler.json"
         },
         "blocks" : [
@@ -394,19 +420,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x027100",
-                    "hash" : "0x594638668c47bf10dd9378aec983b65ecaf772fc590ef2f2512e1319067f7c22",
-                    "mixHash" : "0x624cc2e2d8969dd6017a04f7eb6bae3530b76dff0268e3560a290569980598e3",
-                    "nonce" : "0x1ef3fec82ef24800",
+                    "gasUsed" : "0x0259e2",
+                    "hash" : "0xe085036b600b92231644831038d444c2a66c14ac9d4a9165b18e0bdc9e7aaa10",
+                    "mixHash" : "0xbba8b5a8e524f170078bf236cef7c6d7949090f685f84e230340e123cf8ac650",
+                    "nonce" : "0x755514d9bb1e3c8e",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0x7302b20be0e6be0c3ca557e680a2811ba880cb20c0c5dc97e8c50183f027bc6d",
-                    "stateRoot" : "0x2b1b4d528a9b115bb5a186ca91b485ff2ef50bef0a0fe1de65c83cdd4e6b066b",
+                    "receiptTrie" : "0x51300429a0a0288b9d1a595ef703e176a75eaa18b020c8a54926d57234d067da",
+                    "stateRoot" : "0xdfeecf53942a4ea662b7f26a8368bbe322cf5a6111621d32597638502e607c13",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x19cd1db37d6660bd25003bbd6f49670dc859ce8f9312f8b980c37ffc642e9578",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b1b4d528a9b115bb5a186ca91b485ff2ef50bef0a0fe1de65c83cdd4e6b066ba019cd1db37d6660bd25003bbd6f49670dc859ce8f9312f8b980c37ffc642e9578a07302b20be0e6be0c3ca557e680a2811ba880cb20c0c5dc97e8c50183f027bc6db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0624cc2e2d8969dd6017a04f7eb6bae3530b76dff0268e3560a290569980598e3881ef3fec82ef24800f882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000001ea601ca037adf5d9e690d80655b2e228ce5dec27e6e41f10dbfd16575657260730cd55d1a056c879b168652d16f20c9beaafe9d483087c5a7611f03387378678058010f240c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dfeecf53942a4ea662b7f26a8368bbe322cf5a6111621d32597638502e607c13a019cd1db37d6660bd25003bbd6f49670dc859ce8f9312f8b980c37ffc642e9578a051300429a0a0288b9d1a595ef703e176a75eaa18b020c8a54926d57234d067dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a0bba8b5a8e524f170078bf236cef7c6d7949090f685f84e230340e123cf8ac65088755514d9bb1e3c8ef882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000001ea601ca037adf5d9e690d80655b2e228ce5dec27e6e41f10dbfd16575657260730cd55d1a056c879b168652d16f20c9beaafe9d483087c5a7611f03387378678058010f240c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -443,25 +469,35 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x594638668c47bf10dd9378aec983b65ecaf772fc590ef2f2512e1319067f7c22",
-        "network" : "Homestead",
+        "lastblockhash" : "0xe085036b600b92231644831038d444c2a66c14ac9d4a9165b18e0bdc9e7aaa10",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f67100",
+                "balance" : "0x4563918244f659e2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
             "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x05",
                 "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
                 "nonce" : "0x36",
                 "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01",
+                    "0x04" : "0x0c"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a29f00",
+                "balance" : "0xe8d4a2b61e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -470,8 +506,10 @@
             "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6008600255600060006000f050600c600355",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
+                    "0x02" : "0x08",
+                    "0x03" : "0x0c"
                 }
             }
         },
@@ -499,10 +537,10 @@
             }
         }
     },
-    "RevertDepthCreateOOG_d1g1v1_Metropolis" : {
+    "RevertDepthCreateOOG_d1g1v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d1g1v1Filler.json"
         },
         "blocks" : [
@@ -513,19 +551,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0259e2",
-                    "hash" : "0x9e5075dd7c68df55563856f81e4a69c2be60b70b8f01a20b341c5e84ec7d4684",
-                    "mixHash" : "0x95b006b65e2d91cfa67638442823cc9dea91059a71387aa2f3e151529bad0e65",
-                    "nonce" : "0x2b3912a321efee0d",
+                    "gasUsed" : "0x027100",
+                    "hash" : "0x6704190ca7a89c5659186531f827d4bb0dcd7aa88dc0e546cef321e196e6b730",
+                    "mixHash" : "0xdbd970f4e081e461782c724f3f6ccea8d7dd332962ce65ac9e56515b3a0ab052",
+                    "nonce" : "0x83b0a2690ce51be5",
                     "number" : "0x01",
                     "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
-                    "receiptTrie" : "0x1e4134e4cb2f1fe1fd6582225bcf81c6a06f48432112f70c794cc859d39fa735",
-                    "stateRoot" : "0x0b87c1aea4aebf3a8a7797c04e628d3d204280bc09ad398e96340aca43293859",
+                    "receiptTrie" : "0x7302b20be0e6be0c3ca557e680a2811ba880cb20c0c5dc97e8c50183f027bc6d",
+                    "stateRoot" : "0x2b1b4d528a9b115bb5a186ca91b485ff2ef50bef0a0fe1de65c83cdd4e6b066b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x19cd1db37d6660bd25003bbd6f49670dc859ce8f9312f8b980c37ffc642e9578",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00b87c1aea4aebf3a8a7797c04e628d3d204280bc09ad398e96340aca43293859a019cd1db37d6660bd25003bbd6f49670dc859ce8f9312f8b980c37ffc642e9578a01e4134e4cb2f1fe1fd6582225bcf81c6a06f48432112f70c794cc859d39fa735b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830259e28203e880a095b006b65e2d91cfa67638442823cc9dea91059a71387aa2f3e151529bad0e65882b3912a321efee0df882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000001ea601ca037adf5d9e690d80655b2e228ce5dec27e6e41f10dbfd16575657260730cd55d1a056c879b168652d16f20c9beaafe9d483087c5a7611f03387378678058010f240c0",
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b1b4d528a9b115bb5a186ca91b485ff2ef50bef0a0fe1de65c83cdd4e6b066ba019cd1db37d6660bd25003bbd6f49670dc859ce8f9312f8b980c37ffc642e9578a07302b20be0e6be0c3ca557e680a2811ba880cb20c0c5dc97e8c50183f027bc6db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0dbd970f4e081e461782c724f3f6ccea8d7dd332962ce65ac9e56515b3a0ab0528883b0a2690ce51be5f882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000001ea601ca037adf5d9e690d80655b2e228ce5dec27e6e41f10dbfd16575657260730cd55d1a056c879b168652d16f20c9beaafe9d483087c5a7611f03387378678058010f240c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
@@ -562,27 +600,132 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9e5075dd7c68df55563856f81e4a69c2be60b70b8f01a20b341c5e84ec7d4684",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6704190ca7a89c5659186531f827d4bb0dcd7aa88dc0e546cef321e196e6b730",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f67100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f659e2",
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a29f00",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x05",
+                "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+                "nonce" : "0x36",
+                "storage" : {
+                }
             },
-            "0x3e180b1862f9d158abb5e519a6d8605540c23682" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x6008600255600060006000f050600c600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertDepthCreateOOG_d1g1v1_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepthCreateOOG_d1g1v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x027100",
+                    "hash" : "0x2f43c795675d577513cda6724c482572c0532f2456388ae1639d23fb79f4a549",
+                    "mixHash" : "0xd0ebb2e991a65cf721df8e95a1418021f7dceaf3a06c51902a343fac12396adb",
+                    "nonce" : "0xf72e135b70f398b0",
+                    "number" : "0x01",
+                    "parentHash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
+                    "receiptTrie" : "0x7302b20be0e6be0c3ca557e680a2811ba880cb20c0c5dc97e8c50183f027bc6d",
+                    "stateRoot" : "0x2b1b4d528a9b115bb5a186ca91b485ff2ef50bef0a0fe1de65c83cdd4e6b066b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x19cd1db37d6660bd25003bbd6f49670dc859ce8f9312f8b980c37ffc642e9578",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a08743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b1b4d528a9b115bb5a186ca91b485ff2ef50bef0a0fe1de65c83cdd4e6b066ba019cd1db37d6660bd25003bbd6f49670dc859ce8f9312f8b980c37ffc642e9578a07302b20be0e6be0c3ca557e680a2811ba880cb20c0c5dc97e8c50183f027bc6db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0d0ebb2e991a65cf721df8e95a1418021f7dceaf3a06c51902a343fac12396adb88f72e135b70f398b0f882f88080018302710094a00000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000001ea601ca037adf5d9e690d80655b2e228ce5dec27e6e41f10dbfd16575657260730cd55d1a056c879b168652d16f20c9beaafe9d483087c5a7611f03387378678058010f240c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000000000000000000000000000000000000001ea60",
+                        "gasLimit" : "0x027100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x37adf5d9e690d80655b2e228ce5dec27e6e41f10dbfd16575657260730cd55d1",
+                        "s" : "0x56c879b168652d16f20c9beaafe9d483087c5a7611f03387378678058010f240",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x8743d6698accee1630990d042b3ca26d8e4f8b159f79a80423f97b9bd0f7e0d0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eb464647e12f6457b3ffea1459c38cb1eb63c4472470ff8ff49adb0563692d6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2f43c795675d577513cda6724c482572c0532f2456388ae1639d23fb79f4a549",
+        "network" : "Homestead",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f67100",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
@@ -591,13 +734,10 @@
                 "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
                 "nonce" : "0x36",
                 "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x04" : "0x0c"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2b61e",
+                "balance" : "0xe8d4a29f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -606,10 +746,8 @@
             "0xb000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6008600255600060006000f050600c600355",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
-                    "0x02" : "0x08",
-                    "0x03" : "0x0c"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d0g0v0.json
index df09d9be6..c6048ba3a 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeCalls_d0g0v0_EIP150" : {
+    "RevertOpcodeCalls_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/stRevertTest/RevertOpcodeCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01d011",
-                    "hash" : "0xc46173fb6e30e9e9a8586315b75974c1d6b0507b79cdd62c9e1468a6379ac793",
-                    "mixHash" : "0x814038ea67d9fa7bdc27931c894ea69c74b4e2e4e4c36fd39f0917005e9a28b5",
-                    "nonce" : "0xa02d75c65375c9b5",
+                    "gasUsed" : "0x015af0",
+                    "hash" : "0x73e080e02966dc44b1c2cf99b2162317d2a2628a80406a3d7f9bedb60db76ef9",
+                    "mixHash" : "0xbd2cc6462823a082c308d3e93b248cf03189efc2b6db65a08b44a2ad7245c9f2",
+                    "nonce" : "0x24e9d4e2976dcf22",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0xf478089e7ee54e31b569ad8c432473d350b7fc71287a215850a86b47618ad91a",
-                    "stateRoot" : "0x3a3255da8fd1ddf22ef9dfd75f544b22fd825e4f788178521a6b2b109ec36898",
+                    "receiptTrie" : "0x33436383cb56a7f5a4188f48d3121be555242415757fd3ff68f3f6f210d23605",
+                    "stateRoot" : "0xa4e3984987a026fee1d2dafdf63bb9476ad5e495b3019fb084ca12963833f107",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x95a173afb725eb242baebef6b9ccac3a2b2e0e055ecf19618a55dcb992df0a42",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03a3255da8fd1ddf22ef9dfd75f544b22fd825e4f788178521a6b2b109ec36898a095a173afb725eb242baebef6b9ccac3a2b2e0e055ecf19618a55dcb992df0a42a0f478089e7ee54e31b569ad8c432473d350b7fc71287a215850a86b47618ad91ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301d0118203e880a0814038ea67d9fa7bdc27931c894ea69c74b4e2e4e4c36fd39f0917005e9a28b588a02d75c65375c9b5f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b1ba0b8ccd0980dd709091c7ecf93d8a8259e64799d1619bd529282f859340c86574da022964acdfddee066282dfc1bc65e119006220266edbe5b436e0292d168aaa2afc0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a4e3984987a026fee1d2dafdf63bb9476ad5e495b3019fb084ca12963833f107a095a173afb725eb242baebef6b9ccac3a2b2e0e055ecf19618a55dcb992df0a42a033436383cb56a7f5a4188f48d3121be555242415757fd3ff68f3f6f210d23605b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015af08203e880a0bd2cc6462823a082c308d3e93b248cf03189efc2b6db65a08b44a2ad7245c9f28824e9d4e2976dcf22f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b1ba0b8ccd0980dd709091c7ecf93d8a8259e64799d1619bd529282f859340c86574da022964acdfddee066282dfc1bc65e119006220266edbe5b436e0292d168aaa2afc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc46173fb6e30e9e9a8586315b75974c1d6b0507b79cdd62c9e1468a6379ac793",
-        "network" : "EIP150",
+        "lastblockhash" : "0x73e080e02966dc44b1c2cf99b2162317d2a2628a80406a3d7f9bedb60db76ef9",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600060006000356203f7a0f1600a55",
@@ -74,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5d011",
+                "balance" : "0x4563918244f55af0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a33fef",
+                "balance" : "0xe8d4a3b510",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -190,10 +197,208 @@
             }
         }
     },
-    "RevertOpcodeCalls_d0g0v0_EIP158" : {
+    "RevertOpcodeCalls_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x015af0",
+                    "hash" : "0xd8f59332146b918ccb907361efe637c299f408b290fc6f3dca1a85febeb4895c",
+                    "mixHash" : "0x9784fe122d61ebf1887caa619ac3ba22ad3580c251e52f923c259d1d6db4f8b9",
+                    "nonce" : "0x98719f42f8d2b4b8",
+                    "number" : "0x01",
+                    "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
+                    "receiptTrie" : "0x33436383cb56a7f5a4188f48d3121be555242415757fd3ff68f3f6f210d23605",
+                    "stateRoot" : "0xa4e3984987a026fee1d2dafdf63bb9476ad5e495b3019fb084ca12963833f107",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x95a173afb725eb242baebef6b9ccac3a2b2e0e055ecf19618a55dcb992df0a42",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a4e3984987a026fee1d2dafdf63bb9476ad5e495b3019fb084ca12963833f107a095a173afb725eb242baebef6b9ccac3a2b2e0e055ecf19618a55dcb992df0a42a033436383cb56a7f5a4188f48d3121be555242415757fd3ff68f3f6f210d23605b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015af08203e880a09784fe122d61ebf1887caa619ac3ba22ad3580c251e52f923c259d1d6db4f8b98898719f42f8d2b4b8f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b1ba0b8ccd0980dd709091c7ecf93d8a8259e64799d1619bd529282f859340c86574da022964acdfddee066282dfc1bc65e119006220266edbe5b436e0292d168aaa2afc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "gasLimit" : "0x0704e0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb8ccd0980dd709091c7ecf93d8a8259e64799d1619bd529282f859340c86574d",
+                        "s" : "0x22964acdfddee066282dfc1bc65e119006220266edbe5b436e0292d168aaa2af",
+                        "to" : "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd8f59332146b918ccb907361efe637c299f408b290fc6f3dca1a85febeb4895c",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600060006000356203f7a0f1600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x0a" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f55af0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3b510",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x0e"
+                }
+            },
+            "0xb1005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f2600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb2005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f4600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073b3305374fce5edbc8e2a8697c15331677e6ebf0b620186a0f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3305374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600455600e600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600060006000356203f7a0f1600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb1005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f2600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb2005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f4600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073b3305374fce5edbc8e2a8697c15331677e6ebf0b620186a0f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3305374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600455600e600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeCalls_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/stRevertTest/RevertOpcodeCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -205,9 +410,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01d011",
-                    "hash" : "0xc348d802f8594eda1de4e08399f95aba5eeed4c63d47684a86c8470855b5edda",
-                    "mixHash" : "0x3907134054785ae2b7a76290d3dd71e18ac6eef3b7a589b8a5215833f252b43e",
-                    "nonce" : "0xa8d9b09790ab2365",
+                    "hash" : "0xfa4dfdd2649a31b89ee0fcf9eba6e3e65e7b71c2ebe6b3de2ec9331b24251238",
+                    "mixHash" : "0x28e4616260b26a912bdbe18b470593047b7d4685e08ad3c086c1b6a21dcf9e50",
+                    "nonce" : "0xf062b5a7b5aec4fb",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
                     "receiptTrie" : "0xf478089e7ee54e31b569ad8c432473d350b7fc71287a215850a86b47618ad91a",
@@ -216,7 +421,7 @@
                     "transactionsTrie" : "0x95a173afb725eb242baebef6b9ccac3a2b2e0e055ecf19618a55dcb992df0a42",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03a3255da8fd1ddf22ef9dfd75f544b22fd825e4f788178521a6b2b109ec36898a095a173afb725eb242baebef6b9ccac3a2b2e0e055ecf19618a55dcb992df0a42a0f478089e7ee54e31b569ad8c432473d350b7fc71287a215850a86b47618ad91ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301d0118203e880a03907134054785ae2b7a76290d3dd71e18ac6eef3b7a589b8a5215833f252b43e88a8d9b09790ab2365f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b1ba0b8ccd0980dd709091c7ecf93d8a8259e64799d1619bd529282f859340c86574da022964acdfddee066282dfc1bc65e119006220266edbe5b436e0292d168aaa2afc0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03a3255da8fd1ddf22ef9dfd75f544b22fd825e4f788178521a6b2b109ec36898a095a173afb725eb242baebef6b9ccac3a2b2e0e055ecf19618a55dcb992df0a42a0f478089e7ee54e31b569ad8c432473d350b7fc71287a215850a86b47618ad91ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301d0118203e880a028e4616260b26a912bdbe18b470593047b7d4685e08ad3c086c1b6a21dcf9e5088f062b5a7b5aec4fbf882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b1ba0b8ccd0980dd709091c7ecf93d8a8259e64799d1619bd529282f859340c86574da022964acdfddee066282dfc1bc65e119006220266edbe5b436e0292d168aaa2afc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -253,8 +458,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc348d802f8594eda1de4e08399f95aba5eeed4c63d47684a86c8470855b5edda",
-        "network" : "EIP158",
+        "lastblockhash" : "0xfa4dfdd2649a31b89ee0fcf9eba6e3e65e7b71c2ebe6b3de2ec9331b24251238",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -381,10 +586,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d0g0v0_Frontier" : {
+    "RevertOpcodeCalls_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/stRevertTest/RevertOpcodeCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -395,19 +600,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01cae9",
-                    "hash" : "0x9eec071d39ef4d80777194f89570100c2deb9c07f9b7824235083ed2f737b7b3",
-                    "mixHash" : "0xfa42d9c213dece92b69e3d530edc1511d05a9aab13bf1bd02e0667891d837655",
-                    "nonce" : "0xa11b64f824d3d463",
+                    "gasUsed" : "0x01d011",
+                    "hash" : "0xa0a19a3a7a6cb6def65d32510fd04f33f9a37d03eb78427efe1737f3a48dca55",
+                    "mixHash" : "0x6853b2bed0f36bbb30e3155a46d56c4338e66f94a6e89be026eb38ac7a4c85fd",
+                    "nonce" : "0xd77e1fd79e17a275",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0x6f598209438f5740e614903b38545aa8062d0adeb31033416596c423fcd9912b",
-                    "stateRoot" : "0xfcccc85b1747a205dbd332f8e7205a1d371e2c69c799c51c99a44401f2c402ce",
+                    "receiptTrie" : "0xf478089e7ee54e31b569ad8c432473d350b7fc71287a215850a86b47618ad91a",
+                    "stateRoot" : "0x3a3255da8fd1ddf22ef9dfd75f544b22fd825e4f788178521a6b2b109ec36898",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x95a173afb725eb242baebef6b9ccac3a2b2e0e055ecf19618a55dcb992df0a42",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcccc85b1747a205dbd332f8e7205a1d371e2c69c799c51c99a44401f2c402cea095a173afb725eb242baebef6b9ccac3a2b2e0e055ecf19618a55dcb992df0a42a06f598209438f5740e614903b38545aa8062d0adeb31033416596c423fcd9912bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301cae98203e880a0fa42d9c213dece92b69e3d530edc1511d05a9aab13bf1bd02e0667891d83765588a11b64f824d3d463f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b1ba0b8ccd0980dd709091c7ecf93d8a8259e64799d1619bd529282f859340c86574da022964acdfddee066282dfc1bc65e119006220266edbe5b436e0292d168aaa2afc0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03a3255da8fd1ddf22ef9dfd75f544b22fd825e4f788178521a6b2b109ec36898a095a173afb725eb242baebef6b9ccac3a2b2e0e055ecf19618a55dcb992df0a42a0f478089e7ee54e31b569ad8c432473d350b7fc71287a215850a86b47618ad91ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301d0118203e880a06853b2bed0f36bbb30e3155a46d56c4338e66f94a6e89be026eb38ac7a4c85fd88d77e1fd79e17a275f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b1ba0b8ccd0980dd709091c7ecf93d8a8259e64799d1619bd529282f859340c86574da022964acdfddee066282dfc1bc65e119006220266edbe5b436e0292d168aaa2afc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -444,8 +649,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9eec071d39ef4d80777194f89570100c2deb9c07f9b7824235083ed2f737b7b3",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa0a19a3a7a6cb6def65d32510fd04f33f9a37d03eb78427efe1737f3a48dca55",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -456,14 +661,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5cae9",
+                "balance" : "0x4563918244f5d011",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a34517",
+                "balance" : "0xe8d4a33fef",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -572,10 +777,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d0g0v0_Homestead" : {
+    "RevertOpcodeCalls_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/stRevertTest/RevertOpcodeCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -587,9 +792,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01cae9",
-                    "hash" : "0x53a1ed72f06f6094c42e4e6af04c05a45e74c111e6e8e190793dccfefc9fbe47",
-                    "mixHash" : "0x6a9382b7af411be6162ce68e29f2c3b8a1cbccaa404fe9fde38c202fb5197e70",
-                    "nonce" : "0x1b343dc226281d97",
+                    "hash" : "0x04e3f201708208065e0ba57f56dcc79bab609c670a8662471dd5ecc999c0e5b3",
+                    "mixHash" : "0x5de2f554f4f77346410b4c2df0ea8109c722c84f19f540ac5587005ab806a101",
+                    "nonce" : "0xb6d1e347421d96bf",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
                     "receiptTrie" : "0x6f598209438f5740e614903b38545aa8062d0adeb31033416596c423fcd9912b",
@@ -598,7 +803,7 @@
                     "transactionsTrie" : "0x95a173afb725eb242baebef6b9ccac3a2b2e0e055ecf19618a55dcb992df0a42",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcccc85b1747a205dbd332f8e7205a1d371e2c69c799c51c99a44401f2c402cea095a173afb725eb242baebef6b9ccac3a2b2e0e055ecf19618a55dcb992df0a42a06f598209438f5740e614903b38545aa8062d0adeb31033416596c423fcd9912bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301cae98203e880a06a9382b7af411be6162ce68e29f2c3b8a1cbccaa404fe9fde38c202fb5197e70881b343dc226281d97f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b1ba0b8ccd0980dd709091c7ecf93d8a8259e64799d1619bd529282f859340c86574da022964acdfddee066282dfc1bc65e119006220266edbe5b436e0292d168aaa2afc0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcccc85b1747a205dbd332f8e7205a1d371e2c69c799c51c99a44401f2c402cea095a173afb725eb242baebef6b9ccac3a2b2e0e055ecf19618a55dcb992df0a42a06f598209438f5740e614903b38545aa8062d0adeb31033416596c423fcd9912bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301cae98203e880a05de2f554f4f77346410b4c2df0ea8109c722c84f19f540ac5587005ab806a10188b6d1e347421d96bff882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b1ba0b8ccd0980dd709091c7ecf93d8a8259e64799d1619bd529282f859340c86574da022964acdfddee066282dfc1bc65e119006220266edbe5b436e0292d168aaa2afc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -635,8 +840,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x53a1ed72f06f6094c42e4e6af04c05a45e74c111e6e8e190793dccfefc9fbe47",
-        "network" : "Homestead",
+        "lastblockhash" : "0x04e3f201708208065e0ba57f56dcc79bab609c670a8662471dd5ecc999c0e5b3",
+        "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -763,10 +968,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d0g0v0_Metropolis" : {
+    "RevertOpcodeCalls_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -777,19 +982,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015af0",
-                    "hash" : "0xf3a7250e21a2e83c6078642a0efd68a3d745f6d69953e5ffa3f605f2acc6d863",
-                    "mixHash" : "0x46d80bd14e306631541ee942beec3f346f3187c8823acbe010cc85587194256b",
-                    "nonce" : "0xf82d5c995f6395cf",
+                    "gasUsed" : "0x01cae9",
+                    "hash" : "0xda895beacbd3ffec6976566c98927ac98b1df49cd9c81422d9b9a0b7775e7e4c",
+                    "mixHash" : "0xbb9bc7368406059783639ffd39c2dddab22ce7eed9302f48d3e38b15825bf4d4",
+                    "nonce" : "0xf958e81c6ac0ad41",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0x33436383cb56a7f5a4188f48d3121be555242415757fd3ff68f3f6f210d23605",
-                    "stateRoot" : "0xa4e3984987a026fee1d2dafdf63bb9476ad5e495b3019fb084ca12963833f107",
+                    "receiptTrie" : "0x6f598209438f5740e614903b38545aa8062d0adeb31033416596c423fcd9912b",
+                    "stateRoot" : "0xfcccc85b1747a205dbd332f8e7205a1d371e2c69c799c51c99a44401f2c402ce",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x95a173afb725eb242baebef6b9ccac3a2b2e0e055ecf19618a55dcb992df0a42",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a4e3984987a026fee1d2dafdf63bb9476ad5e495b3019fb084ca12963833f107a095a173afb725eb242baebef6b9ccac3a2b2e0e055ecf19618a55dcb992df0a42a033436383cb56a7f5a4188f48d3121be555242415757fd3ff68f3f6f210d23605b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015af08203e880a046d80bd14e306631541ee942beec3f346f3187c8823acbe010cc85587194256b88f82d5c995f6395cff882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b1ba0b8ccd0980dd709091c7ecf93d8a8259e64799d1619bd529282f859340c86574da022964acdfddee066282dfc1bc65e119006220266edbe5b436e0292d168aaa2afc0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcccc85b1747a205dbd332f8e7205a1d371e2c69c799c51c99a44401f2c402cea095a173afb725eb242baebef6b9ccac3a2b2e0e055ecf19618a55dcb992df0a42a06f598209438f5740e614903b38545aa8062d0adeb31033416596c423fcd9912bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301cae98203e880a0bb9bc7368406059783639ffd39c2dddab22ce7eed9302f48d3e38b15825bf4d488f958e81c6ac0ad41f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b1ba0b8ccd0980dd709091c7ecf93d8a8259e64799d1619bd529282f859340c86574da022964acdfddee066282dfc1bc65e119006220266edbe5b436e0292d168aaa2afc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -826,16 +1031,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf3a7250e21a2e83c6078642a0efd68a3d745f6d69953e5ffa3f605f2acc6d863",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xda895beacbd3ffec6976566c98927ac98b1df49cd9c81422d9b9a0b7775e7e4c",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600060006000356203f7a0f1600a55",
@@ -845,14 +1043,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55af0",
+                "balance" : "0x4563918244f5cae9",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3b510",
+                "balance" : "0xe8d4a34517",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d0g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d0g1v0.json
index 7f5e54c6d..7a5e05be0 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeCalls_d0g1v0_EIP150" : {
+    "RevertOpcodeCalls_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0157c0",
-                    "hash" : "0x762132ed906b555f65e2ca3d72f9728049af05c0b665f9195e6499832c799e00",
-                    "mixHash" : "0x4e386d02774178cc98130169c382111497322a5f579d33d211cd783cb2151d3d",
-                    "nonce" : "0x99dedd08a3e1dd14",
+                    "hash" : "0x2ce78e9e62a2466495ec4b47963fe8772526e69e444beda14adbd8b303c4ad3e",
+                    "mixHash" : "0x6881745059f732cdb2071da8394125f38dc0791a7f3669c60c9259c7e975233a",
+                    "nonce" : "0xc7c3505ee8109af6",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0xb19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1a",
-                    "stateRoot" : "0x35ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337",
+                    "receiptTrie" : "0x16da45289df813b179464ae168d5bbfa18a300385b581f721a70ad12dc6c3b2c",
+                    "stateRoot" : "0x6d5dcce0413d09bf78af9e4664b66d9bd597c8ecae8bb77b3c5a51ce4ddf88a2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x880970eddfb30c2b58b3b916ca667b8787d80cac0d6b1e19740f46a7472c75ef",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a0880970eddfb30c2b58b3b916ca667b8787d80cac0d6b1e19740f46a7472c75efa0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a04e386d02774178cc98130169c382111497322a5f579d33d211cd783cb2151d3d8899dedd08a3e1dd14f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b1ca06a590a8af5c42762d4037a1c905357d891e8d2267075445010509ff52fc13342a01e5c1fbabcf3c5ee9d4d449378ef6aa4b643412b0dcbb11c57946bf51e3547e8c0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d5dcce0413d09bf78af9e4664b66d9bd597c8ecae8bb77b3c5a51ce4ddf88a2a0880970eddfb30c2b58b3b916ca667b8787d80cac0d6b1e19740f46a7472c75efa016da45289df813b179464ae168d5bbfa18a300385b581f721a70ad12dc6c3b2cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a06881745059f732cdb2071da8394125f38dc0791a7f3669c60c9259c7e975233a88c7c3505ee8109af6f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b1ca06a590a8af5c42762d4037a1c905357d891e8d2267075445010509ff52fc13342a01e5c1fbabcf3c5ee9d4d449378ef6aa4b643412b0dcbb11c57946bf51e3547e8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x762132ed906b555f65e2ca3d72f9728049af05c0b665f9195e6499832c799e00",
-        "network" : "EIP150",
+        "lastblockhash" : "0x2ce78e9e62a2466495ec4b47963fe8772526e69e444beda14adbd8b303c4ad3e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600060006000356203f7a0f1600a55",
@@ -188,10 +195,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d0g1v0_EIP158" : {
+    "RevertOpcodeCalls_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -203,18 +210,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0157c0",
-                    "hash" : "0x620d4fbba5dbce58a3bab184c7269a6389a3518b7494dac5038940f37313d8cb",
-                    "mixHash" : "0x6869fb474a40f47f742337570e22b705e2d091b7c67cba09021a3e877e2e77ed",
-                    "nonce" : "0xcb3e6f8777660adf",
+                    "hash" : "0x569fa558066ece9a075993650229cd1f80df4bee2880f1ec0550655008d4ea11",
+                    "mixHash" : "0x091a498109bd2998f33c8e4c0bd022d6ee2e3248f43ba9b72714246a398e0f22",
+                    "nonce" : "0xfa663fbffcda7ddb",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0xb19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1a",
-                    "stateRoot" : "0x35ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337",
+                    "receiptTrie" : "0x16da45289df813b179464ae168d5bbfa18a300385b581f721a70ad12dc6c3b2c",
+                    "stateRoot" : "0x6d5dcce0413d09bf78af9e4664b66d9bd597c8ecae8bb77b3c5a51ce4ddf88a2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x880970eddfb30c2b58b3b916ca667b8787d80cac0d6b1e19740f46a7472c75ef",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a0880970eddfb30c2b58b3b916ca667b8787d80cac0d6b1e19740f46a7472c75efa0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a06869fb474a40f47f742337570e22b705e2d091b7c67cba09021a3e877e2e77ed88cb3e6f8777660adff882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b1ca06a590a8af5c42762d4037a1c905357d891e8d2267075445010509ff52fc13342a01e5c1fbabcf3c5ee9d4d449378ef6aa4b643412b0dcbb11c57946bf51e3547e8c0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d5dcce0413d09bf78af9e4664b66d9bd597c8ecae8bb77b3c5a51ce4ddf88a2a0880970eddfb30c2b58b3b916ca667b8787d80cac0d6b1e19740f46a7472c75efa016da45289df813b179464ae168d5bbfa18a300385b581f721a70ad12dc6c3b2cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a0091a498109bd2998f33c8e4c0bd022d6ee2e3248f43ba9b72714246a398e0f2288fa663fbffcda7ddbf882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b1ca06a590a8af5c42762d4037a1c905357d891e8d2267075445010509ff52fc13342a01e5c1fbabcf3c5ee9d4d449378ef6aa4b643412b0dcbb11c57946bf51e3547e8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -251,9 +258,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x620d4fbba5dbce58a3bab184c7269a6389a3518b7494dac5038940f37313d8cb",
-        "network" : "EIP158",
+        "lastblockhash" : "0x569fa558066ece9a075993650229cd1f80df4bee2880f1ec0550655008d4ea11",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600060006000356203f7a0f1600a55",
@@ -377,10 +391,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d0g1v0_Frontier" : {
+    "RevertOpcodeCalls_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -392,9 +406,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0157c0",
-                    "hash" : "0x418bae28d4af555c1c3506385d61b00799f15a286963cfda2e7a4e3cd84cdc76",
-                    "mixHash" : "0xa902b1b45eed2fa0f744e590507246a366a052f1a59c2fa352f03dbfa96e8b6b",
-                    "nonce" : "0xfd219897240c2b16",
+                    "hash" : "0x1252fb3952c9d41ec46f4a783d28108fa95b03c8bfe31180970a86607317ddfd",
+                    "mixHash" : "0x3e50fea2361b4a22c5de9fc8cf2fc7bdf6c703d55766bc7da0c90fac9ef585fd",
+                    "nonce" : "0x0ae2e0fa1a14e91c",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
                     "receiptTrie" : "0xb19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1a",
@@ -403,7 +417,7 @@
                     "transactionsTrie" : "0x880970eddfb30c2b58b3b916ca667b8787d80cac0d6b1e19740f46a7472c75ef",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a0880970eddfb30c2b58b3b916ca667b8787d80cac0d6b1e19740f46a7472c75efa0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a0a902b1b45eed2fa0f744e590507246a366a052f1a59c2fa352f03dbfa96e8b6b88fd219897240c2b16f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b1ca06a590a8af5c42762d4037a1c905357d891e8d2267075445010509ff52fc13342a01e5c1fbabcf3c5ee9d4d449378ef6aa4b643412b0dcbb11c57946bf51e3547e8c0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a0880970eddfb30c2b58b3b916ca667b8787d80cac0d6b1e19740f46a7472c75efa0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a03e50fea2361b4a22c5de9fc8cf2fc7bdf6c703d55766bc7da0c90fac9ef585fd880ae2e0fa1a14e91cf882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b1ca06a590a8af5c42762d4037a1c905357d891e8d2267075445010509ff52fc13342a01e5c1fbabcf3c5ee9d4d449378ef6aa4b643412b0dcbb11c57946bf51e3547e8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -440,8 +454,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x418bae28d4af555c1c3506385d61b00799f15a286963cfda2e7a4e3cd84cdc76",
-        "network" : "Frontier",
+        "lastblockhash" : "0x1252fb3952c9d41ec46f4a783d28108fa95b03c8bfe31180970a86607317ddfd",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -566,10 +580,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d0g1v0_Homestead" : {
+    "RevertOpcodeCalls_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -581,9 +595,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0157c0",
-                    "hash" : "0xc8a292c26fbeee04e55b3b49f49c18d2900400e47aa928c368173e28a6e94bdb",
-                    "mixHash" : "0x2ea098084e66e7db2f5a35f279d1a40ca150b7b77dc80a56a37d8ad980d5c6f0",
-                    "nonce" : "0x16faef961f5ecc6a",
+                    "hash" : "0xbbf4d2e36cbad41081c6ada96daf3915f75dfc1be593bf0aff8e5483cd15c655",
+                    "mixHash" : "0xaf4c690ed4c7d5cd1c4357d504bf163e6296f200b068c242864a805d27031ca0",
+                    "nonce" : "0x71ac447245901750",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
                     "receiptTrie" : "0xb19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1a",
@@ -592,7 +606,7 @@
                     "transactionsTrie" : "0x880970eddfb30c2b58b3b916ca667b8787d80cac0d6b1e19740f46a7472c75ef",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a0880970eddfb30c2b58b3b916ca667b8787d80cac0d6b1e19740f46a7472c75efa0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a02ea098084e66e7db2f5a35f279d1a40ca150b7b77dc80a56a37d8ad980d5c6f08816faef961f5ecc6af882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b1ca06a590a8af5c42762d4037a1c905357d891e8d2267075445010509ff52fc13342a01e5c1fbabcf3c5ee9d4d449378ef6aa4b643412b0dcbb11c57946bf51e3547e8c0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a0880970eddfb30c2b58b3b916ca667b8787d80cac0d6b1e19740f46a7472c75efa0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a0af4c690ed4c7d5cd1c4357d504bf163e6296f200b068c242864a805d27031ca08871ac447245901750f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b1ca06a590a8af5c42762d4037a1c905357d891e8d2267075445010509ff52fc13342a01e5c1fbabcf3c5ee9d4d449378ef6aa4b643412b0dcbb11c57946bf51e3547e8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -629,8 +643,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc8a292c26fbeee04e55b3b49f49c18d2900400e47aa928c368173e28a6e94bdb",
-        "network" : "Homestead",
+        "lastblockhash" : "0xbbf4d2e36cbad41081c6ada96daf3915f75dfc1be593bf0aff8e5483cd15c655",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -755,10 +769,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d0g1v0_Metropolis" : {
+    "RevertOpcodeCalls_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -770,18 +784,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0157c0",
-                    "hash" : "0x549503ad879b854f1578128e80137eb46d9bea9460a7180d7edcd3a3440a0b7c",
-                    "mixHash" : "0x92c9d19453e7e1cbd98bbca33cd2b1d555ddad384b6fd5ca1183523ea1eca98a",
-                    "nonce" : "0x023074600540c20d",
+                    "hash" : "0x301f96b0263fd1a6c69c25c94736aedc6c59d7c9b701c62d0b407e029af9229b",
+                    "mixHash" : "0x58b6fcb4119819b3e33fc942f3a14ff6728d2e5cbd09da95efbba4af72375174",
+                    "nonce" : "0xcd2bcf623e0b84e4",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0x16da45289df813b179464ae168d5bbfa18a300385b581f721a70ad12dc6c3b2c",
-                    "stateRoot" : "0x6d5dcce0413d09bf78af9e4664b66d9bd597c8ecae8bb77b3c5a51ce4ddf88a2",
+                    "receiptTrie" : "0xb19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1a",
+                    "stateRoot" : "0x35ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x880970eddfb30c2b58b3b916ca667b8787d80cac0d6b1e19740f46a7472c75ef",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d5dcce0413d09bf78af9e4664b66d9bd597c8ecae8bb77b3c5a51ce4ddf88a2a0880970eddfb30c2b58b3b916ca667b8787d80cac0d6b1e19740f46a7472c75efa016da45289df813b179464ae168d5bbfa18a300385b581f721a70ad12dc6c3b2cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a092c9d19453e7e1cbd98bbca33cd2b1d555ddad384b6fd5ca1183523ea1eca98a88023074600540c20df882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b1ca06a590a8af5c42762d4037a1c905357d891e8d2267075445010509ff52fc13342a01e5c1fbabcf3c5ee9d4d449378ef6aa4b643412b0dcbb11c57946bf51e3547e8c0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a0880970eddfb30c2b58b3b916ca667b8787d80cac0d6b1e19740f46a7472c75efa0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a058b6fcb4119819b3e33fc942f3a14ff6728d2e5cbd09da95efbba4af7237517488cd2bcf623e0b84e4f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b1ca06a590a8af5c42762d4037a1c905357d891e8d2267075445010509ff52fc13342a01e5c1fbabcf3c5ee9d4d449378ef6aa4b643412b0dcbb11c57946bf51e3547e8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -818,16 +832,198 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x549503ad879b854f1578128e80137eb46d9bea9460a7180d7edcd3a3440a0b7c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x301f96b0263fd1a6c69c25c94736aedc6c59d7c9b701c62d0b407e029af9229b",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600060006000356203f7a0f1600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f557c0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3b840",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb1005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f2600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb2005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f4600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073b3305374fce5edbc8e2a8697c15331677e6ebf0b620186a0f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3305374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600455600e600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600060006000356203f7a0f1600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb1005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f2600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb2005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f4600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073b3305374fce5edbc8e2a8697c15331677e6ebf0b620186a0f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3305374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600455600e600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeCalls_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0157c0",
+                    "hash" : "0xd9881fad077e0625dd7ad7f272f6ac46f20e8594cef2c7dbc02cbaa06f1d46a9",
+                    "mixHash" : "0x4001ef624836467e729adc9d31ad8d1ca46d6dfafc583ca8e5537094f4744e94",
+                    "nonce" : "0x951f13f9f2003180",
+                    "number" : "0x01",
+                    "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
+                    "receiptTrie" : "0xb19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1a",
+                    "stateRoot" : "0x35ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x880970eddfb30c2b58b3b916ca667b8787d80cac0d6b1e19740f46a7472c75ef",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a0880970eddfb30c2b58b3b916ca667b8787d80cac0d6b1e19740f46a7472c75efa0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a04001ef624836467e729adc9d31ad8d1ca46d6dfafc583ca8e5537094f4744e9488951f13f9f2003180f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b1ca06a590a8af5c42762d4037a1c905357d891e8d2267075445010509ff52fc13342a01e5c1fbabcf3c5ee9d4d449378ef6aa4b643412b0dcbb11c57946bf51e3547e8c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000b0005374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "gasLimit" : "0x0157c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a590a8af5c42762d4037a1c905357d891e8d2267075445010509ff52fc13342",
+                        "s" : "0x1e5c1fbabcf3c5ee9d4d449378ef6aa4b643412b0dcbb11c57946bf51e3547e8",
+                        "to" : "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd9881fad077e0625dd7ad7f272f6ac46f20e8594cef2c7dbc02cbaa06f1d46a9",
+        "network" : "Homestead",
+        "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600060006000356203f7a0f1600a55",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d1g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d1g0v0.json
index 3cddbf17c..e34f89a68 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d1g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d1g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeCalls_d1g0v0_EIP150" : {
+    "RevertOpcodeCalls_d1g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01d011",
-                    "hash" : "0x69cd33450cf47bc22b40912577309b5e894021548bcc039f0a6b46e12de92655",
-                    "mixHash" : "0xb4fc4e0d76c5cb631349bc80c22121c4d56d0757fb9ff68cbcffdedfa21302c5",
-                    "nonce" : "0x83e8035342db5b59",
+                    "gasUsed" : "0x015af0",
+                    "hash" : "0x5ca0ca8df6d88f6da202aed82397e0929cc3e2fa016086db2c76b7a36f1d175d",
+                    "mixHash" : "0x562c5684f3b254d5d29c3042368ea24f1e29ed3a5ce2e31c9031a2ff771c5cef",
+                    "nonce" : "0x47b89464b1cd3e47",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0x56bb7ee19a5b01b58cc95d058cdeb7a237845e0e2a50d5842b4fcc6afa5fab20",
-                    "stateRoot" : "0xd46d1c3b0826a1962593b27e593989742a486ab526b7e096f42c32b1e408e215",
+                    "receiptTrie" : "0x33436383cb56a7f5a4188f48d3121be555242415757fd3ff68f3f6f210d23605",
+                    "stateRoot" : "0x91aefe240137cf6dc8007b689bdcfed32ceeb273968845cc70408582551a1330",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8c2fd52381540502283592280fbc5c9ca214d88a06508b233c0e23e34d62534c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d46d1c3b0826a1962593b27e593989742a486ab526b7e096f42c32b1e408e215a08c2fd52381540502283592280fbc5c9ca214d88a06508b233c0e23e34d62534ca056bb7ee19a5b01b58cc95d058cdeb7a237845e0e2a50d5842b4fcc6afa5fab20b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301d0118203e880a0b4fc4e0d76c5cb631349bc80c22121c4d56d0757fb9ff68cbcffdedfa21302c58883e8035342db5b59f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b1ca0921cf4b7902e3004cfca020c2964a0a1e2e46d258b52cc6215e78bca790f30a9a077055d66ca9ba81917958e0dad00b37808db63af4de8eacebd7c14516ab9a04dc0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091aefe240137cf6dc8007b689bdcfed32ceeb273968845cc70408582551a1330a08c2fd52381540502283592280fbc5c9ca214d88a06508b233c0e23e34d62534ca033436383cb56a7f5a4188f48d3121be555242415757fd3ff68f3f6f210d23605b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015af08203e880a0562c5684f3b254d5d29c3042368ea24f1e29ed3a5ce2e31c9031a2ff771c5cef8847b89464b1cd3e47f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b1ca0921cf4b7902e3004cfca020c2964a0a1e2e46d258b52cc6215e78bca790f30a9a077055d66ca9ba81917958e0dad00b37808db63af4de8eacebd7c14516ab9a04dc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x69cd33450cf47bc22b40912577309b5e894021548bcc039f0a6b46e12de92655",
-        "network" : "EIP150",
+        "lastblockhash" : "0x5ca0ca8df6d88f6da202aed82397e0929cc3e2fa016086db2c76b7a36f1d175d",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600060006000356203f7a0f1600a55",
@@ -74,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5d011",
+                "balance" : "0x4563918244f55af0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a33fef",
+                "balance" : "0xe8d4a3b510",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -190,10 +197,208 @@
             }
         }
     },
-    "RevertOpcodeCalls_d1g0v0_EIP158" : {
+    "RevertOpcodeCalls_d1g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d1g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x015af0",
+                    "hash" : "0x2fdfeb9c78b261b9ddcb73eb9c0f40185508abfcdd9fb033ef40305ca3c4cc3d",
+                    "mixHash" : "0xf2203f7ae3d4ee9f58dcb9eb2b081b740aed451931ebdf6220f9672ef24c72e2",
+                    "nonce" : "0x42938f8e93b6187c",
+                    "number" : "0x01",
+                    "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
+                    "receiptTrie" : "0x33436383cb56a7f5a4188f48d3121be555242415757fd3ff68f3f6f210d23605",
+                    "stateRoot" : "0x91aefe240137cf6dc8007b689bdcfed32ceeb273968845cc70408582551a1330",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8c2fd52381540502283592280fbc5c9ca214d88a06508b233c0e23e34d62534c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091aefe240137cf6dc8007b689bdcfed32ceeb273968845cc70408582551a1330a08c2fd52381540502283592280fbc5c9ca214d88a06508b233c0e23e34d62534ca033436383cb56a7f5a4188f48d3121be555242415757fd3ff68f3f6f210d23605b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015af08203e880a0f2203f7ae3d4ee9f58dcb9eb2b081b740aed451931ebdf6220f9672ef24c72e28842938f8e93b6187cf882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b1ca0921cf4b7902e3004cfca020c2964a0a1e2e46d258b52cc6215e78bca790f30a9a077055d66ca9ba81917958e0dad00b37808db63af4de8eacebd7c14516ab9a04dc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "gasLimit" : "0x0704e0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x921cf4b7902e3004cfca020c2964a0a1e2e46d258b52cc6215e78bca790f30a9",
+                        "s" : "0x77055d66ca9ba81917958e0dad00b37808db63af4de8eacebd7c14516ab9a04d",
+                        "to" : "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2fdfeb9c78b261b9ddcb73eb9c0f40185508abfcdd9fb033ef40305ca3c4cc3d",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600060006000356203f7a0f1600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x0a" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f55af0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3b510",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb1005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f2600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x0e"
+                }
+            },
+            "0xb2005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f4600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073b3305374fce5edbc8e2a8697c15331677e6ebf0b620186a0f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3305374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600455600e600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600060006000356203f7a0f1600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb1005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f2600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb2005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f4600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073b3305374fce5edbc8e2a8697c15331677e6ebf0b620186a0f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3305374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600455600e600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeCalls_d1g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -205,9 +410,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01d011",
-                    "hash" : "0x3d13261fcd9c7e40740d27c31f5d1c0cc87eb9816c820d0647213e52e5c5e125",
-                    "mixHash" : "0x118e9e63bd1474ea588824223c84fc8d4c4cd33124e6f2aaac26bd916686e3c9",
-                    "nonce" : "0xa83cf6de8d46767b",
+                    "hash" : "0x6f9732f3184acc8102141a5343a369a9ba569e1a7eb887758f4609140ba63857",
+                    "mixHash" : "0xe406c45d22294a4fc06adb67d8a2d5fac966d99a3c42ac6583c3f7082c3764c5",
+                    "nonce" : "0x9f3ed4607f8c1391",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
                     "receiptTrie" : "0x56bb7ee19a5b01b58cc95d058cdeb7a237845e0e2a50d5842b4fcc6afa5fab20",
@@ -216,7 +421,7 @@
                     "transactionsTrie" : "0x8c2fd52381540502283592280fbc5c9ca214d88a06508b233c0e23e34d62534c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d46d1c3b0826a1962593b27e593989742a486ab526b7e096f42c32b1e408e215a08c2fd52381540502283592280fbc5c9ca214d88a06508b233c0e23e34d62534ca056bb7ee19a5b01b58cc95d058cdeb7a237845e0e2a50d5842b4fcc6afa5fab20b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301d0118203e880a0118e9e63bd1474ea588824223c84fc8d4c4cd33124e6f2aaac26bd916686e3c988a83cf6de8d46767bf882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b1ca0921cf4b7902e3004cfca020c2964a0a1e2e46d258b52cc6215e78bca790f30a9a077055d66ca9ba81917958e0dad00b37808db63af4de8eacebd7c14516ab9a04dc0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d46d1c3b0826a1962593b27e593989742a486ab526b7e096f42c32b1e408e215a08c2fd52381540502283592280fbc5c9ca214d88a06508b233c0e23e34d62534ca056bb7ee19a5b01b58cc95d058cdeb7a237845e0e2a50d5842b4fcc6afa5fab20b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301d0118203e880a0e406c45d22294a4fc06adb67d8a2d5fac966d99a3c42ac6583c3f7082c3764c5889f3ed4607f8c1391f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b1ca0921cf4b7902e3004cfca020c2964a0a1e2e46d258b52cc6215e78bca790f30a9a077055d66ca9ba81917958e0dad00b37808db63af4de8eacebd7c14516ab9a04dc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -253,8 +458,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3d13261fcd9c7e40740d27c31f5d1c0cc87eb9816c820d0647213e52e5c5e125",
-        "network" : "EIP158",
+        "lastblockhash" : "0x6f9732f3184acc8102141a5343a369a9ba569e1a7eb887758f4609140ba63857",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -381,10 +586,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d1g0v0_Frontier" : {
+    "RevertOpcodeCalls_d1g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -395,19 +600,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01cae9",
-                    "hash" : "0x2bc3a4eabea506c236e55044d5f96e7b7fb5a1f2de6f7e2e881511bf0ca47733",
-                    "mixHash" : "0xf266f1c2abd78921ab3af5ad60e8ca694acf95faad965b3f1a617c7df7c87a9a",
-                    "nonce" : "0x7d18b12dd90c6989",
+                    "gasUsed" : "0x01d011",
+                    "hash" : "0x9758bdc8fbf05d9fcdfd096462aac64d534963bdb6f7a6f3c772e6adf93a9b12",
+                    "mixHash" : "0xd6b687a96fcaa78d4dcebfe845f7bfce57268c3d2427deb7e6ebeb265e177fbd",
+                    "nonce" : "0x600c00b17df5f46e",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0xc5b120b9329ed8fc13f5b15be13608e6a88fc8889adbfd0788f5d393f86a8e7a",
-                    "stateRoot" : "0x88abb8a1796feea8d5ce6c1d85228606b1901b7b8c2297bc3e9b79e702aa3a7a",
+                    "receiptTrie" : "0x56bb7ee19a5b01b58cc95d058cdeb7a237845e0e2a50d5842b4fcc6afa5fab20",
+                    "stateRoot" : "0xd46d1c3b0826a1962593b27e593989742a486ab526b7e096f42c32b1e408e215",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8c2fd52381540502283592280fbc5c9ca214d88a06508b233c0e23e34d62534c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088abb8a1796feea8d5ce6c1d85228606b1901b7b8c2297bc3e9b79e702aa3a7aa08c2fd52381540502283592280fbc5c9ca214d88a06508b233c0e23e34d62534ca0c5b120b9329ed8fc13f5b15be13608e6a88fc8889adbfd0788f5d393f86a8e7ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301cae98203e880a0f266f1c2abd78921ab3af5ad60e8ca694acf95faad965b3f1a617c7df7c87a9a887d18b12dd90c6989f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b1ca0921cf4b7902e3004cfca020c2964a0a1e2e46d258b52cc6215e78bca790f30a9a077055d66ca9ba81917958e0dad00b37808db63af4de8eacebd7c14516ab9a04dc0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d46d1c3b0826a1962593b27e593989742a486ab526b7e096f42c32b1e408e215a08c2fd52381540502283592280fbc5c9ca214d88a06508b233c0e23e34d62534ca056bb7ee19a5b01b58cc95d058cdeb7a237845e0e2a50d5842b4fcc6afa5fab20b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301d0118203e880a0d6b687a96fcaa78d4dcebfe845f7bfce57268c3d2427deb7e6ebeb265e177fbd88600c00b17df5f46ef882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b1ca0921cf4b7902e3004cfca020c2964a0a1e2e46d258b52cc6215e78bca790f30a9a077055d66ca9ba81917958e0dad00b37808db63af4de8eacebd7c14516ab9a04dc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -444,8 +649,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2bc3a4eabea506c236e55044d5f96e7b7fb5a1f2de6f7e2e881511bf0ca47733",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9758bdc8fbf05d9fcdfd096462aac64d534963bdb6f7a6f3c772e6adf93a9b12",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -456,14 +661,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5cae9",
+                "balance" : "0x4563918244f5d011",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a34517",
+                "balance" : "0xe8d4a33fef",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -572,10 +777,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d1g0v0_Homestead" : {
+    "RevertOpcodeCalls_d1g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -587,9 +792,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01cae9",
-                    "hash" : "0xa0e0fb754798caec5de36b7f0dc526db3c937aa41d9ce9001ba65ace2360e2c7",
-                    "mixHash" : "0xf07a4d531df7fbe22f3824ce745658dfe7355994f0cc7e200a2dcefb2ff29e30",
-                    "nonce" : "0xc60cea1e3d3228ff",
+                    "hash" : "0x92f2af14894664c4afcaaee0971a99e36355c90377c1552563ea789aa66010b1",
+                    "mixHash" : "0x683b7de9151db18a67e5e4903a972fa76ff63e2f2f36a07a56f5db0d847eb216",
+                    "nonce" : "0x13213f3deb2948d5",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
                     "receiptTrie" : "0xc5b120b9329ed8fc13f5b15be13608e6a88fc8889adbfd0788f5d393f86a8e7a",
@@ -598,7 +803,7 @@
                     "transactionsTrie" : "0x8c2fd52381540502283592280fbc5c9ca214d88a06508b233c0e23e34d62534c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088abb8a1796feea8d5ce6c1d85228606b1901b7b8c2297bc3e9b79e702aa3a7aa08c2fd52381540502283592280fbc5c9ca214d88a06508b233c0e23e34d62534ca0c5b120b9329ed8fc13f5b15be13608e6a88fc8889adbfd0788f5d393f86a8e7ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301cae98203e880a0f07a4d531df7fbe22f3824ce745658dfe7355994f0cc7e200a2dcefb2ff29e3088c60cea1e3d3228fff882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b1ca0921cf4b7902e3004cfca020c2964a0a1e2e46d258b52cc6215e78bca790f30a9a077055d66ca9ba81917958e0dad00b37808db63af4de8eacebd7c14516ab9a04dc0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088abb8a1796feea8d5ce6c1d85228606b1901b7b8c2297bc3e9b79e702aa3a7aa08c2fd52381540502283592280fbc5c9ca214d88a06508b233c0e23e34d62534ca0c5b120b9329ed8fc13f5b15be13608e6a88fc8889adbfd0788f5d393f86a8e7ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301cae98203e880a0683b7de9151db18a67e5e4903a972fa76ff63e2f2f36a07a56f5db0d847eb2168813213f3deb2948d5f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b1ca0921cf4b7902e3004cfca020c2964a0a1e2e46d258b52cc6215e78bca790f30a9a077055d66ca9ba81917958e0dad00b37808db63af4de8eacebd7c14516ab9a04dc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -635,8 +840,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa0e0fb754798caec5de36b7f0dc526db3c937aa41d9ce9001ba65ace2360e2c7",
-        "network" : "Homestead",
+        "lastblockhash" : "0x92f2af14894664c4afcaaee0971a99e36355c90377c1552563ea789aa66010b1",
+        "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -763,10 +968,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d1g0v0_Metropolis" : {
+    "RevertOpcodeCalls_d1g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -777,19 +982,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015af0",
-                    "hash" : "0xbc5ab02945fe015e3064f096ce92f537a3a2e89d72d7f827b46219c00cc800df",
-                    "mixHash" : "0x06da21d25a994f8efecdd6067c83e7b69a79266c1ad25a0c161a72c460bcb7f1",
-                    "nonce" : "0x34e8223418db19c5",
+                    "gasUsed" : "0x01cae9",
+                    "hash" : "0x4e1acaa84df7d8325d7efcee835599a5fd98894165e705dcedd7f903b7992815",
+                    "mixHash" : "0xed128a18bee09c7e4ff1112b574af9d078c6f476b65e763a6e3bb835616c2a0c",
+                    "nonce" : "0x2686569418c7aaaa",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0x33436383cb56a7f5a4188f48d3121be555242415757fd3ff68f3f6f210d23605",
-                    "stateRoot" : "0x91aefe240137cf6dc8007b689bdcfed32ceeb273968845cc70408582551a1330",
+                    "receiptTrie" : "0xc5b120b9329ed8fc13f5b15be13608e6a88fc8889adbfd0788f5d393f86a8e7a",
+                    "stateRoot" : "0x88abb8a1796feea8d5ce6c1d85228606b1901b7b8c2297bc3e9b79e702aa3a7a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8c2fd52381540502283592280fbc5c9ca214d88a06508b233c0e23e34d62534c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091aefe240137cf6dc8007b689bdcfed32ceeb273968845cc70408582551a1330a08c2fd52381540502283592280fbc5c9ca214d88a06508b233c0e23e34d62534ca033436383cb56a7f5a4188f48d3121be555242415757fd3ff68f3f6f210d23605b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015af08203e880a006da21d25a994f8efecdd6067c83e7b69a79266c1ad25a0c161a72c460bcb7f18834e8223418db19c5f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b1ca0921cf4b7902e3004cfca020c2964a0a1e2e46d258b52cc6215e78bca790f30a9a077055d66ca9ba81917958e0dad00b37808db63af4de8eacebd7c14516ab9a04dc0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088abb8a1796feea8d5ce6c1d85228606b1901b7b8c2297bc3e9b79e702aa3a7aa08c2fd52381540502283592280fbc5c9ca214d88a06508b233c0e23e34d62534ca0c5b120b9329ed8fc13f5b15be13608e6a88fc8889adbfd0788f5d393f86a8e7ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301cae98203e880a0ed128a18bee09c7e4ff1112b574af9d078c6f476b65e763a6e3bb835616c2a0c882686569418c7aaaaf882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b1ca0921cf4b7902e3004cfca020c2964a0a1e2e46d258b52cc6215e78bca790f30a9a077055d66ca9ba81917958e0dad00b37808db63af4de8eacebd7c14516ab9a04dc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -826,16 +1031,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbc5ab02945fe015e3064f096ce92f537a3a2e89d72d7f827b46219c00cc800df",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4e1acaa84df7d8325d7efcee835599a5fd98894165e705dcedd7f903b7992815",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600060006000356203f7a0f1600a55",
@@ -845,14 +1043,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55af0",
+                "balance" : "0x4563918244f5cae9",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3b510",
+                "balance" : "0xe8d4a34517",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d1g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d1g1v0.json
index a527c7e9c..d61309aab 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d1g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d1g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeCalls_d1g1v0_EIP150" : {
+    "RevertOpcodeCalls_d1g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0157c0",
-                    "hash" : "0x7b5fc3f5bdeb908b0af56351e5d6735ff767e2e4da94638ba82881932c39316e",
-                    "mixHash" : "0xf93e943a37c679e5bdd715d71ce758231159485f305353ea81fa02764f3a2cef",
-                    "nonce" : "0x0b903eefade61435",
+                    "hash" : "0xa62cc4ccfa8e4a2f6ca01b54f7e7e84e4349db1a92a03c2a89b405b29fecd862",
+                    "mixHash" : "0xd801ff10d2b6de463ed746d554284b841104c7f869def9aa4690abbb1880eb0d",
+                    "nonce" : "0xccc28136b6fc794f",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0xb19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1a",
-                    "stateRoot" : "0x35ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337",
+                    "receiptTrie" : "0x16da45289df813b179464ae168d5bbfa18a300385b581f721a70ad12dc6c3b2c",
+                    "stateRoot" : "0x6d5dcce0413d09bf78af9e4664b66d9bd597c8ecae8bb77b3c5a51ce4ddf88a2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xde32c11fc0f42916e6c8d40eafb04d5d3696d828e26c2f714725c6cef8b19340",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a0de32c11fc0f42916e6c8d40eafb04d5d3696d828e26c2f714725c6cef8b19340a0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a0f93e943a37c679e5bdd715d71ce758231159485f305353ea81fa02764f3a2cef880b903eefade61435f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b1ba0dd7cfb22044e241d165205e79062b6c5803b7b4b116974174b3658c6c0c07124a07fb040e54a5861a5bd7a0d7400134665dffd984040346f994fa75ba5f096497bc0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d5dcce0413d09bf78af9e4664b66d9bd597c8ecae8bb77b3c5a51ce4ddf88a2a0de32c11fc0f42916e6c8d40eafb04d5d3696d828e26c2f714725c6cef8b19340a016da45289df813b179464ae168d5bbfa18a300385b581f721a70ad12dc6c3b2cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a0d801ff10d2b6de463ed746d554284b841104c7f869def9aa4690abbb1880eb0d88ccc28136b6fc794ff882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b1ba0dd7cfb22044e241d165205e79062b6c5803b7b4b116974174b3658c6c0c07124a07fb040e54a5861a5bd7a0d7400134665dffd984040346f994fa75ba5f096497bc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7b5fc3f5bdeb908b0af56351e5d6735ff767e2e4da94638ba82881932c39316e",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa62cc4ccfa8e4a2f6ca01b54f7e7e84e4349db1a92a03c2a89b405b29fecd862",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600060006000356203f7a0f1600a55",
@@ -188,10 +195,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d1g1v0_EIP158" : {
+    "RevertOpcodeCalls_d1g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -203,18 +210,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0157c0",
-                    "hash" : "0x79ea22300d76a98786ba574894f3fd91f27100ea1c29eb7b7518ee33174798ac",
-                    "mixHash" : "0xb7ca1f54ecc19b8a6559e1b217106d063c91b6536f53ce64f772c7112b4193e2",
-                    "nonce" : "0x6e7abeb1c7883fdc",
+                    "hash" : "0x5a06e763b3b287e8e5f4e65a2ebbce2cba842fe392f31e882ef2560ce4c2fb87",
+                    "mixHash" : "0x15b40bf54b12dc21cbba8b6112f2cc30a7b0572e7e8746d414f0ab2ef32ec15c",
+                    "nonce" : "0x9f12127748a05978",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0xb19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1a",
-                    "stateRoot" : "0x35ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337",
+                    "receiptTrie" : "0x16da45289df813b179464ae168d5bbfa18a300385b581f721a70ad12dc6c3b2c",
+                    "stateRoot" : "0x6d5dcce0413d09bf78af9e4664b66d9bd597c8ecae8bb77b3c5a51ce4ddf88a2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xde32c11fc0f42916e6c8d40eafb04d5d3696d828e26c2f714725c6cef8b19340",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a0de32c11fc0f42916e6c8d40eafb04d5d3696d828e26c2f714725c6cef8b19340a0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a0b7ca1f54ecc19b8a6559e1b217106d063c91b6536f53ce64f772c7112b4193e2886e7abeb1c7883fdcf882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b1ba0dd7cfb22044e241d165205e79062b6c5803b7b4b116974174b3658c6c0c07124a07fb040e54a5861a5bd7a0d7400134665dffd984040346f994fa75ba5f096497bc0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d5dcce0413d09bf78af9e4664b66d9bd597c8ecae8bb77b3c5a51ce4ddf88a2a0de32c11fc0f42916e6c8d40eafb04d5d3696d828e26c2f714725c6cef8b19340a016da45289df813b179464ae168d5bbfa18a300385b581f721a70ad12dc6c3b2cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a015b40bf54b12dc21cbba8b6112f2cc30a7b0572e7e8746d414f0ab2ef32ec15c889f12127748a05978f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b1ba0dd7cfb22044e241d165205e79062b6c5803b7b4b116974174b3658c6c0c07124a07fb040e54a5861a5bd7a0d7400134665dffd984040346f994fa75ba5f096497bc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -251,9 +258,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x79ea22300d76a98786ba574894f3fd91f27100ea1c29eb7b7518ee33174798ac",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5a06e763b3b287e8e5f4e65a2ebbce2cba842fe392f31e882ef2560ce4c2fb87",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600060006000356203f7a0f1600a55",
@@ -377,10 +391,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d1g1v0_Frontier" : {
+    "RevertOpcodeCalls_d1g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -392,9 +406,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0157c0",
-                    "hash" : "0x6a9943d91b04423ef728528bccb1463afcb2f134708a65f55eb5e5bd7df9c225",
-                    "mixHash" : "0x8306acdae950b2849a8fb28ea75167eb452cedd5ac9690cc4d72e4893b148d3f",
-                    "nonce" : "0x2df59bcb015d2be3",
+                    "hash" : "0x8e5c0822d3e3a763b4c0ca48a9c73b9fea088835a3c4cc4852347b6b4175a4bc",
+                    "mixHash" : "0x514906da436f9996e0cf52a2ea3bf1052cedb951cfc61a388b4adbecd5d4bef5",
+                    "nonce" : "0x6eafada2ce0cbcfa",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
                     "receiptTrie" : "0xb19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1a",
@@ -403,7 +417,7 @@
                     "transactionsTrie" : "0xde32c11fc0f42916e6c8d40eafb04d5d3696d828e26c2f714725c6cef8b19340",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a0de32c11fc0f42916e6c8d40eafb04d5d3696d828e26c2f714725c6cef8b19340a0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a08306acdae950b2849a8fb28ea75167eb452cedd5ac9690cc4d72e4893b148d3f882df59bcb015d2be3f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b1ba0dd7cfb22044e241d165205e79062b6c5803b7b4b116974174b3658c6c0c07124a07fb040e54a5861a5bd7a0d7400134665dffd984040346f994fa75ba5f096497bc0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a0de32c11fc0f42916e6c8d40eafb04d5d3696d828e26c2f714725c6cef8b19340a0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a0514906da436f9996e0cf52a2ea3bf1052cedb951cfc61a388b4adbecd5d4bef5886eafada2ce0cbcfaf882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b1ba0dd7cfb22044e241d165205e79062b6c5803b7b4b116974174b3658c6c0c07124a07fb040e54a5861a5bd7a0d7400134665dffd984040346f994fa75ba5f096497bc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -440,8 +454,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6a9943d91b04423ef728528bccb1463afcb2f134708a65f55eb5e5bd7df9c225",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8e5c0822d3e3a763b4c0ca48a9c73b9fea088835a3c4cc4852347b6b4175a4bc",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -566,10 +580,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d1g1v0_Homestead" : {
+    "RevertOpcodeCalls_d1g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -581,9 +595,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0157c0",
-                    "hash" : "0x30e6c29404056622e997f57606cb4e065128982aacd026e9cdc5c3bfadd414bb",
-                    "mixHash" : "0xc77904d6d9c650f10e376ea522a8b1a734efed51d19bc90b0b5d9c60c85f27f8",
-                    "nonce" : "0xf83ba7bd83dde28e",
+                    "hash" : "0x2b3c852c3d193a37aa9aa786008c411d890ce0247391199722b4ea3f666f8414",
+                    "mixHash" : "0x6c78b71e5da01003f2ac36e80b03364ce4a39f3f8f3f195225b074c7db8e5f22",
+                    "nonce" : "0x82f244cb8e44a8d9",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
                     "receiptTrie" : "0xb19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1a",
@@ -592,7 +606,7 @@
                     "transactionsTrie" : "0xde32c11fc0f42916e6c8d40eafb04d5d3696d828e26c2f714725c6cef8b19340",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a0de32c11fc0f42916e6c8d40eafb04d5d3696d828e26c2f714725c6cef8b19340a0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a0c77904d6d9c650f10e376ea522a8b1a734efed51d19bc90b0b5d9c60c85f27f888f83ba7bd83dde28ef882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b1ba0dd7cfb22044e241d165205e79062b6c5803b7b4b116974174b3658c6c0c07124a07fb040e54a5861a5bd7a0d7400134665dffd984040346f994fa75ba5f096497bc0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a0de32c11fc0f42916e6c8d40eafb04d5d3696d828e26c2f714725c6cef8b19340a0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a06c78b71e5da01003f2ac36e80b03364ce4a39f3f8f3f195225b074c7db8e5f228882f244cb8e44a8d9f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b1ba0dd7cfb22044e241d165205e79062b6c5803b7b4b116974174b3658c6c0c07124a07fb040e54a5861a5bd7a0d7400134665dffd984040346f994fa75ba5f096497bc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -629,8 +643,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x30e6c29404056622e997f57606cb4e065128982aacd026e9cdc5c3bfadd414bb",
-        "network" : "Homestead",
+        "lastblockhash" : "0x2b3c852c3d193a37aa9aa786008c411d890ce0247391199722b4ea3f666f8414",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -755,10 +769,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d1g1v0_Metropolis" : {
+    "RevertOpcodeCalls_d1g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -770,18 +784,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0157c0",
-                    "hash" : "0x6c4f5d370810dca0b7024d9111e509a742bc2548485451079526dadecb4307f4",
-                    "mixHash" : "0xec90a9414661d807a6eb6afdd20a0b542b60c9e534dcb633c95c46b913343d3b",
-                    "nonce" : "0x385ded2811e2a2c0",
+                    "hash" : "0x5a3f6129ccc39b1d152c1387d5d63884fdcd5cf5a39c0d98649f5126e7ab8e3d",
+                    "mixHash" : "0x72f6766b0f9585994a0ec132fdf71132c3d04dbf44d825fa8ea173746c165ee3",
+                    "nonce" : "0x420939d100215d87",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0x16da45289df813b179464ae168d5bbfa18a300385b581f721a70ad12dc6c3b2c",
-                    "stateRoot" : "0x6d5dcce0413d09bf78af9e4664b66d9bd597c8ecae8bb77b3c5a51ce4ddf88a2",
+                    "receiptTrie" : "0xb19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1a",
+                    "stateRoot" : "0x35ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xde32c11fc0f42916e6c8d40eafb04d5d3696d828e26c2f714725c6cef8b19340",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d5dcce0413d09bf78af9e4664b66d9bd597c8ecae8bb77b3c5a51ce4ddf88a2a0de32c11fc0f42916e6c8d40eafb04d5d3696d828e26c2f714725c6cef8b19340a016da45289df813b179464ae168d5bbfa18a300385b581f721a70ad12dc6c3b2cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a0ec90a9414661d807a6eb6afdd20a0b542b60c9e534dcb633c95c46b913343d3b88385ded2811e2a2c0f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b1ba0dd7cfb22044e241d165205e79062b6c5803b7b4b116974174b3658c6c0c07124a07fb040e54a5861a5bd7a0d7400134665dffd984040346f994fa75ba5f096497bc0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a0de32c11fc0f42916e6c8d40eafb04d5d3696d828e26c2f714725c6cef8b19340a0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a072f6766b0f9585994a0ec132fdf71132c3d04dbf44d825fa8ea173746c165ee388420939d100215d87f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b1ba0dd7cfb22044e241d165205e79062b6c5803b7b4b116974174b3658c6c0c07124a07fb040e54a5861a5bd7a0d7400134665dffd984040346f994fa75ba5f096497bc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -818,16 +832,198 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6c4f5d370810dca0b7024d9111e509a742bc2548485451079526dadecb4307f4",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x5a3f6129ccc39b1d152c1387d5d63884fdcd5cf5a39c0d98649f5126e7ab8e3d",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600060006000356203f7a0f1600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f557c0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3b840",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb1005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f2600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb2005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f4600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073b3305374fce5edbc8e2a8697c15331677e6ebf0b620186a0f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3305374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600455600e600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600060006000356203f7a0f1600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb1005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f2600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb2005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f4600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073b3305374fce5edbc8e2a8697c15331677e6ebf0b620186a0f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3305374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600455600e600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeCalls_d1g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d1g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0157c0",
+                    "hash" : "0x2e192bbf08c3241b84e516cd4d03827283b638901759cec2628772fce75a1805",
+                    "mixHash" : "0x76acd99bdfbb454ee1c3da493e2e81708e7f47aa061173b4d1a05b9d49d06b67",
+                    "nonce" : "0xfea735f966ed11cf",
+                    "number" : "0x01",
+                    "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
+                    "receiptTrie" : "0xb19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1a",
+                    "stateRoot" : "0x35ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xde32c11fc0f42916e6c8d40eafb04d5d3696d828e26c2f714725c6cef8b19340",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a0de32c11fc0f42916e6c8d40eafb04d5d3696d828e26c2f714725c6cef8b19340a0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a076acd99bdfbb454ee1c3da493e2e81708e7f47aa061173b4d1a05b9d49d06b6788fea735f966ed11cff882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b1ba0dd7cfb22044e241d165205e79062b6c5803b7b4b116974174b3658c6c0c07124a07fb040e54a5861a5bd7a0d7400134665dffd984040346f994fa75ba5f096497bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000b1005374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "gasLimit" : "0x0157c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdd7cfb22044e241d165205e79062b6c5803b7b4b116974174b3658c6c0c07124",
+                        "s" : "0x7fb040e54a5861a5bd7a0d7400134665dffd984040346f994fa75ba5f096497b",
+                        "to" : "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2e192bbf08c3241b84e516cd4d03827283b638901759cec2628772fce75a1805",
+        "network" : "Homestead",
+        "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600060006000356203f7a0f1600a55",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d2g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d2g0v0.json
index 44e28caa5..b500bc816 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d2g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d2g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeCalls_d2g0v0_EIP150" : {
+    "RevertOpcodeCalls_d2g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01d00e",
-                    "hash" : "0x646f52e7013675d127443b2f51ac4a2debdf7fe9805b8669191e75a1361507a5",
-                    "mixHash" : "0x9affd252d6d800cba5ae6c2ab2928d538d46146e91a9ceb27bd8758d30fd7036",
-                    "nonce" : "0xb291dc0c027238dc",
+                    "gasUsed" : "0x015aed",
+                    "hash" : "0xc0f94dc88578609c17e5b9063c78cb1fff553f698303a31c4fa8fd6f4322566c",
+                    "mixHash" : "0x8e27ab600b9fe0dc50d0c08d52913a36045f95624f18ee26a7fe30db4f336a51",
+                    "nonce" : "0x5d3eed323fc3bde0",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0x35c5641477502a5120119c172619a5e0578de43e4fd7411b5155cc367846c549",
-                    "stateRoot" : "0xee8e1a9bc0777c5ebca8b5f00634c0929a6ef46eb7ac12762e2c87534e27c416",
+                    "receiptTrie" : "0x6c94dfc001f2da6c25664d9dc77f8dee7e11cdd55a31b896cdf1964e4922b0a1",
+                    "stateRoot" : "0xa0ffa5c6d73ecd82b1398a09660a150ca83dc2f9a901778bbd52b3ad3aeb1b4a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdccedb0cfa977a5f6869101b6f78faf55f0f213c27a39d011ecc35c9864aeae7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee8e1a9bc0777c5ebca8b5f00634c0929a6ef46eb7ac12762e2c87534e27c416a0dccedb0cfa977a5f6869101b6f78faf55f0f213c27a39d011ecc35c9864aeae7a035c5641477502a5120119c172619a5e0578de43e4fd7411b5155cc367846c549b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301d00e8203e880a09affd252d6d800cba5ae6c2ab2928d538d46146e91a9ceb27bd8758d30fd703688b291dc0c027238dcf882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b1ba04140920c043cd3e79869b31f66cf8df7876e713ca9b22a02166c64d6b6b4af94a06644b9b57ec791da3ff6a208ef82b30b1f708b793ec66609e8512cb5f270d65bc0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0ffa5c6d73ecd82b1398a09660a150ca83dc2f9a901778bbd52b3ad3aeb1b4aa0dccedb0cfa977a5f6869101b6f78faf55f0f213c27a39d011ecc35c9864aeae7a06c94dfc001f2da6c25664d9dc77f8dee7e11cdd55a31b896cdf1964e4922b0a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015aed8203e880a08e27ab600b9fe0dc50d0c08d52913a36045f95624f18ee26a7fe30db4f336a51885d3eed323fc3bde0f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b1ba04140920c043cd3e79869b31f66cf8df7876e713ca9b22a02166c64d6b6b4af94a06644b9b57ec791da3ff6a208ef82b30b1f708b793ec66609e8512cb5f270d65bc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x646f52e7013675d127443b2f51ac4a2debdf7fe9805b8669191e75a1361507a5",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc0f94dc88578609c17e5b9063c78cb1fff553f698303a31c4fa8fd6f4322566c",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600060006000356203f7a0f1600a55",
@@ -74,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5d00e",
+                "balance" : "0x4563918244f55aed",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a33ff2",
+                "balance" : "0xe8d4a3b513",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -190,10 +197,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d2g0v0_EIP158" : {
+    "RevertOpcodeCalls_d2g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -204,19 +211,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01d00e",
-                    "hash" : "0x34fa5fc99649fa51c7e6334fb31b6a607b3c78e985f5b7eacef99abeb75bfef0",
-                    "mixHash" : "0xf139c7299225c9818ef26ec6060a9aecc6ef241a7b9d8da19c12e8b7e3293827",
-                    "nonce" : "0x076ca9a3b164e9f6",
+                    "gasUsed" : "0x015aed",
+                    "hash" : "0x07decc36b3241382d870f40de0dcf9f0c4740ad8fb888ed3cf7518ee56024e09",
+                    "mixHash" : "0x62169847c18bd7f60eacd66ad711fe5d84b5d7f5d5c2ca62fb5cd2e1323bca71",
+                    "nonce" : "0x94a25d33ec2a4e69",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0x35c5641477502a5120119c172619a5e0578de43e4fd7411b5155cc367846c549",
-                    "stateRoot" : "0xee8e1a9bc0777c5ebca8b5f00634c0929a6ef46eb7ac12762e2c87534e27c416",
+                    "receiptTrie" : "0x6c94dfc001f2da6c25664d9dc77f8dee7e11cdd55a31b896cdf1964e4922b0a1",
+                    "stateRoot" : "0xa0ffa5c6d73ecd82b1398a09660a150ca83dc2f9a901778bbd52b3ad3aeb1b4a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdccedb0cfa977a5f6869101b6f78faf55f0f213c27a39d011ecc35c9864aeae7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee8e1a9bc0777c5ebca8b5f00634c0929a6ef46eb7ac12762e2c87534e27c416a0dccedb0cfa977a5f6869101b6f78faf55f0f213c27a39d011ecc35c9864aeae7a035c5641477502a5120119c172619a5e0578de43e4fd7411b5155cc367846c549b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301d00e8203e880a0f139c7299225c9818ef26ec6060a9aecc6ef241a7b9d8da19c12e8b7e329382788076ca9a3b164e9f6f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b1ba04140920c043cd3e79869b31f66cf8df7876e713ca9b22a02166c64d6b6b4af94a06644b9b57ec791da3ff6a208ef82b30b1f708b793ec66609e8512cb5f270d65bc0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0ffa5c6d73ecd82b1398a09660a150ca83dc2f9a901778bbd52b3ad3aeb1b4aa0dccedb0cfa977a5f6869101b6f78faf55f0f213c27a39d011ecc35c9864aeae7a06c94dfc001f2da6c25664d9dc77f8dee7e11cdd55a31b896cdf1964e4922b0a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015aed8203e880a062169847c18bd7f60eacd66ad711fe5d84b5d7f5d5c2ca62fb5cd2e1323bca718894a25d33ec2a4e69f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b1ba04140920c043cd3e79869b31f66cf8df7876e713ca9b22a02166c64d6b6b4af94a06644b9b57ec791da3ff6a208ef82b30b1f708b793ec66609e8512cb5f270d65bc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -253,9 +260,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x34fa5fc99649fa51c7e6334fb31b6a607b3c78e985f5b7eacef99abeb75bfef0",
-        "network" : "EIP158",
+        "lastblockhash" : "0x07decc36b3241382d870f40de0dcf9f0c4740ad8fb888ed3cf7518ee56024e09",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600060006000356203f7a0f1600a55",
@@ -265,14 +279,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5d00e",
+                "balance" : "0x4563918244f55aed",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a33ff2",
+                "balance" : "0xe8d4a3b513",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -381,10 +395,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d2g0v0_Frontier" : {
+    "RevertOpcodeCalls_d2g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -395,19 +409,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0462b3",
-                    "hash" : "0x5045245f40683e6cff19e92408fbf6f8dc88b67e918c5e45216dbcceb218d2a9",
-                    "mixHash" : "0xdbadd4fd5b4b970d293e763bcb48ba67ad833a0b9960a871e648edb911626e40",
-                    "nonce" : "0x565a2629bdbfa3e0",
+                    "gasUsed" : "0x01d00e",
+                    "hash" : "0xe04a67f9f4e328849347c35b0d34fca7328d3bc8991ef9079f862547fdee53d9",
+                    "mixHash" : "0x97dea8d17e76610deef4e87305ab6c3c7fe33222c40f7d88accab3b552ceb586",
+                    "nonce" : "0x048d248db8615b90",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0x3662769ce700d7ffca275c67dfaa106bbd4b0f0b5dc01b5ac26214c26d87a485",
-                    "stateRoot" : "0xea7764ee09c83ebc233c90c7b21f58f3a1fc5317d2e3f6e3372d71a7a08616cd",
+                    "receiptTrie" : "0x35c5641477502a5120119c172619a5e0578de43e4fd7411b5155cc367846c549",
+                    "stateRoot" : "0xee8e1a9bc0777c5ebca8b5f00634c0929a6ef46eb7ac12762e2c87534e27c416",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdccedb0cfa977a5f6869101b6f78faf55f0f213c27a39d011ecc35c9864aeae7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ea7764ee09c83ebc233c90c7b21f58f3a1fc5317d2e3f6e3372d71a7a08616cda0dccedb0cfa977a5f6869101b6f78faf55f0f213c27a39d011ecc35c9864aeae7a03662769ce700d7ffca275c67dfaa106bbd4b0f0b5dc01b5ac26214c26d87a485b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830462b38203e880a0dbadd4fd5b4b970d293e763bcb48ba67ad833a0b9960a871e648edb911626e4088565a2629bdbfa3e0f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b1ba04140920c043cd3e79869b31f66cf8df7876e713ca9b22a02166c64d6b6b4af94a06644b9b57ec791da3ff6a208ef82b30b1f708b793ec66609e8512cb5f270d65bc0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee8e1a9bc0777c5ebca8b5f00634c0929a6ef46eb7ac12762e2c87534e27c416a0dccedb0cfa977a5f6869101b6f78faf55f0f213c27a39d011ecc35c9864aeae7a035c5641477502a5120119c172619a5e0578de43e4fd7411b5155cc367846c549b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301d00e8203e880a097dea8d17e76610deef4e87305ab6c3c7fe33222c40f7d88accab3b552ceb58688048d248db8615b90f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b1ba04140920c043cd3e79869b31f66cf8df7876e713ca9b22a02166c64d6b6b4af94a06644b9b57ec791da3ff6a208ef82b30b1f708b793ec66609e8512cb5f270d65bc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -444,25 +458,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5045245f40683e6cff19e92408fbf6f8dc88b67e918c5e45216dbcceb218d2a9",
-        "network" : "Frontier",
+        "lastblockhash" : "0xe04a67f9f4e328849347c35b0d34fca7328d3bc8991ef9079f862547fdee53d9",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600060006000356203f7a0f1600a55",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x0a" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f862b3",
+                "balance" : "0x4563918244f5d00e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a0ad4d",
+                "balance" : "0xe8d4a33ff2",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -487,6 +502,7 @@
                 "code" : "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f4600055600e600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x02" : "0x0e"
                 }
             },
             "0xb3005374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -570,10 +586,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d2g0v0_Homestead" : {
+    "RevertOpcodeCalls_d2g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -584,19 +600,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01cae6",
-                    "hash" : "0x0528553e06a5e10229b060a94799afc75b7054b7867019d0e6a01c15ed75b2d6",
-                    "mixHash" : "0x7c03a8e8642b59a8c313a15a900b0ab5ba2d27a40d7df4434f6746181132793b",
-                    "nonce" : "0xc9eaae5c7582baf9",
+                    "gasUsed" : "0x01d00e",
+                    "hash" : "0xc89aca9aed2281b5f517739ecc68f03e5dccb1962bb4e6cb87432b4027f6857f",
+                    "mixHash" : "0xa17a1ad09ce789b35b743f618d537a09478b4ec33ebb9c1e16f48eed72db875a",
+                    "nonce" : "0x13148533a89b949f",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0x3873eae3d869626f56149ffa8c348d9eea42e524715df5549a64435af2261835",
-                    "stateRoot" : "0xd96bce1a361926f5773a703f81219c06126c0cc1fc11efedece7ee03f307611c",
+                    "receiptTrie" : "0x35c5641477502a5120119c172619a5e0578de43e4fd7411b5155cc367846c549",
+                    "stateRoot" : "0xee8e1a9bc0777c5ebca8b5f00634c0929a6ef46eb7ac12762e2c87534e27c416",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdccedb0cfa977a5f6869101b6f78faf55f0f213c27a39d011ecc35c9864aeae7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d96bce1a361926f5773a703f81219c06126c0cc1fc11efedece7ee03f307611ca0dccedb0cfa977a5f6869101b6f78faf55f0f213c27a39d011ecc35c9864aeae7a03873eae3d869626f56149ffa8c348d9eea42e524715df5549a64435af2261835b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301cae68203e880a07c03a8e8642b59a8c313a15a900b0ab5ba2d27a40d7df4434f6746181132793b88c9eaae5c7582baf9f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b1ba04140920c043cd3e79869b31f66cf8df7876e713ca9b22a02166c64d6b6b4af94a06644b9b57ec791da3ff6a208ef82b30b1f708b793ec66609e8512cb5f270d65bc0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee8e1a9bc0777c5ebca8b5f00634c0929a6ef46eb7ac12762e2c87534e27c416a0dccedb0cfa977a5f6869101b6f78faf55f0f213c27a39d011ecc35c9864aeae7a035c5641477502a5120119c172619a5e0578de43e4fd7411b5155cc367846c549b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301d00e8203e880a0a17a1ad09ce789b35b743f618d537a09478b4ec33ebb9c1e16f48eed72db875a8813148533a89b949ff882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b1ba04140920c043cd3e79869b31f66cf8df7876e713ca9b22a02166c64d6b6b4af94a06644b9b57ec791da3ff6a208ef82b30b1f708b793ec66609e8512cb5f270d65bc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -633,8 +649,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0528553e06a5e10229b060a94799afc75b7054b7867019d0e6a01c15ed75b2d6",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc89aca9aed2281b5f517739ecc68f03e5dccb1962bb4e6cb87432b4027f6857f",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -645,14 +661,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5cae6",
+                "balance" : "0x4563918244f5d00e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3451a",
+                "balance" : "0xe8d4a33ff2",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -761,10 +777,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d2g0v0_Metropolis" : {
+    "RevertOpcodeCalls_d2g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -775,19 +791,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015aed",
-                    "hash" : "0xf2f59b98c82519a587cf1f4799aa3e67ec1d78481995b0412290c9206b826775",
-                    "mixHash" : "0xabea495def95e2b5ce8ee3e4eb8d68301bcb523097e86df1f80d5c3ceb5bc5c2",
-                    "nonce" : "0xa04f6adba82a45b8",
+                    "gasUsed" : "0x0462b3",
+                    "hash" : "0xda93391487d4a7afa626cb98e2950f1ac5f0f1419936675087a800becaa4007b",
+                    "mixHash" : "0xf5b3d069cb39c49073e0292dfb4853df5d8a5ce226513ef766fca837ceca0aff",
+                    "nonce" : "0x32c53763a4ae2473",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0x6c94dfc001f2da6c25664d9dc77f8dee7e11cdd55a31b896cdf1964e4922b0a1",
-                    "stateRoot" : "0xa0ffa5c6d73ecd82b1398a09660a150ca83dc2f9a901778bbd52b3ad3aeb1b4a",
+                    "receiptTrie" : "0x3662769ce700d7ffca275c67dfaa106bbd4b0f0b5dc01b5ac26214c26d87a485",
+                    "stateRoot" : "0xea7764ee09c83ebc233c90c7b21f58f3a1fc5317d2e3f6e3372d71a7a08616cd",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdccedb0cfa977a5f6869101b6f78faf55f0f213c27a39d011ecc35c9864aeae7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0ffa5c6d73ecd82b1398a09660a150ca83dc2f9a901778bbd52b3ad3aeb1b4aa0dccedb0cfa977a5f6869101b6f78faf55f0f213c27a39d011ecc35c9864aeae7a06c94dfc001f2da6c25664d9dc77f8dee7e11cdd55a31b896cdf1964e4922b0a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083015aed8203e880a0abea495def95e2b5ce8ee3e4eb8d68301bcb523097e86df1f80d5c3ceb5bc5c288a04f6adba82a45b8f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b1ba04140920c043cd3e79869b31f66cf8df7876e713ca9b22a02166c64d6b6b4af94a06644b9b57ec791da3ff6a208ef82b30b1f708b793ec66609e8512cb5f270d65bc0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ea7764ee09c83ebc233c90c7b21f58f3a1fc5317d2e3f6e3372d71a7a08616cda0dccedb0cfa977a5f6869101b6f78faf55f0f213c27a39d011ecc35c9864aeae7a03662769ce700d7ffca275c67dfaa106bbd4b0f0b5dc01b5ac26214c26d87a485b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830462b38203e880a0f5b3d069cb39c49073e0292dfb4853df5d8a5ce226513ef766fca837ceca0aff8832c53763a4ae2473f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b1ba04140920c043cd3e79869b31f66cf8df7876e713ca9b22a02166c64d6b6b4af94a06644b9b57ec791da3ff6a208ef82b30b1f708b793ec66609e8512cb5f270d65bc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -824,16 +840,198 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf2f59b98c82519a587cf1f4799aa3e67ec1d78481995b0412290c9206b826775",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xda93391487d4a7afa626cb98e2950f1ac5f0f1419936675087a800becaa4007b",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600060006000356203f7a0f1600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f862b3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a0ad4d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb1005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f2600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb2005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f4600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073b3305374fce5edbc8e2a8697c15331677e6ebf0b620186a0f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3305374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600455600e600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600060006000356203f7a0f1600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb1005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f2600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb2005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f4600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073b3305374fce5edbc8e2a8697c15331677e6ebf0b620186a0f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3305374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600455600e600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeCalls_d2g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d2g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01cae6",
+                    "hash" : "0xe88fc4b62489a4fdd463a432a1b16873d420d89dd5c8c36aac48bb9684ca5bfe",
+                    "mixHash" : "0x4dd0d88623c0268aa4abae3364fd8e42772ecee1104305160a1d7e140666b87c",
+                    "nonce" : "0x71a360cf02a84cd4",
+                    "number" : "0x01",
+                    "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
+                    "receiptTrie" : "0x3873eae3d869626f56149ffa8c348d9eea42e524715df5549a64435af2261835",
+                    "stateRoot" : "0xd96bce1a361926f5773a703f81219c06126c0cc1fc11efedece7ee03f307611c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xdccedb0cfa977a5f6869101b6f78faf55f0f213c27a39d011ecc35c9864aeae7",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d96bce1a361926f5773a703f81219c06126c0cc1fc11efedece7ee03f307611ca0dccedb0cfa977a5f6869101b6f78faf55f0f213c27a39d011ecc35c9864aeae7a03873eae3d869626f56149ffa8c348d9eea42e524715df5549a64435af2261835b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301cae68203e880a04dd0d88623c0268aa4abae3364fd8e42772ecee1104305160a1d7e140666b87c8871a360cf02a84cd4f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b1ba04140920c043cd3e79869b31f66cf8df7876e713ca9b22a02166c64d6b6b4af94a06644b9b57ec791da3ff6a208ef82b30b1f708b793ec66609e8512cb5f270d65bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "gasLimit" : "0x0704e0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4140920c043cd3e79869b31f66cf8df7876e713ca9b22a02166c64d6b6b4af94",
+                        "s" : "0x6644b9b57ec791da3ff6a208ef82b30b1f708b793ec66609e8512cb5f270d65b",
+                        "to" : "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe88fc4b62489a4fdd463a432a1b16873d420d89dd5c8c36aac48bb9684ca5bfe",
+        "network" : "Homestead",
+        "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600060006000356203f7a0f1600a55",
@@ -843,14 +1041,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55aed",
+                "balance" : "0x4563918244f5cae6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3b513",
+                "balance" : "0xe8d4a3451a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d2g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d2g1v0.json
index 40d14331f..c46dd65b1 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d2g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d2g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeCalls_d2g1v0_EIP150" : {
+    "RevertOpcodeCalls_d2g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d2g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0157c0",
-                    "hash" : "0xb0e242b79eaa5da5aa74df9bae299e22aa8770513b827efa63db16994bde2c48",
-                    "mixHash" : "0x22a41de2cc2d9af3f0d2ffa1bab8375b1dbe73118336ba4979a476f2536e1962",
-                    "nonce" : "0x477594f663e38b31",
+                    "hash" : "0x7126f200820c0ba021555a8a59df6ac29ea18eee03cf1031d670f502ddc5052d",
+                    "mixHash" : "0x6d26b647889122e5411a87fc68b53b14088ad14b76272902f96cdd6dde924456",
+                    "nonce" : "0xdb15ccd1777acf7e",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0xb19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1a",
-                    "stateRoot" : "0x35ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337",
+                    "receiptTrie" : "0x16da45289df813b179464ae168d5bbfa18a300385b581f721a70ad12dc6c3b2c",
+                    "stateRoot" : "0x6d5dcce0413d09bf78af9e4664b66d9bd597c8ecae8bb77b3c5a51ce4ddf88a2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9b50bd1015cbb6bdb857b6e21980e468f3c18092a08345bd84a92bed67972f5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a0c9b50bd1015cbb6bdb857b6e21980e468f3c18092a08345bd84a92bed67972f5a0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a022a41de2cc2d9af3f0d2ffa1bab8375b1dbe73118336ba4979a476f2536e196288477594f663e38b31f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b1ba0ffdb1c820ec7ddda9fdd86657ae77da9e2e283426ee9497937768df3540102aea060b9e83a7e906d5920a5e07e9437c5117c4c184da156a1cd84a5248753f91ea2c0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d5dcce0413d09bf78af9e4664b66d9bd597c8ecae8bb77b3c5a51ce4ddf88a2a0c9b50bd1015cbb6bdb857b6e21980e468f3c18092a08345bd84a92bed67972f5a016da45289df813b179464ae168d5bbfa18a300385b581f721a70ad12dc6c3b2cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a06d26b647889122e5411a87fc68b53b14088ad14b76272902f96cdd6dde92445688db15ccd1777acf7ef882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b1ba0ffdb1c820ec7ddda9fdd86657ae77da9e2e283426ee9497937768df3540102aea060b9e83a7e906d5920a5e07e9437c5117c4c184da156a1cd84a5248753f91ea2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb0e242b79eaa5da5aa74df9bae299e22aa8770513b827efa63db16994bde2c48",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7126f200820c0ba021555a8a59df6ac29ea18eee03cf1031d670f502ddc5052d",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600060006000356203f7a0f1600a55",
@@ -188,10 +195,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d2g1v0_EIP158" : {
+    "RevertOpcodeCalls_d2g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d2g1v0Filler.json"
         },
         "blocks" : [
@@ -203,18 +210,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0157c0",
-                    "hash" : "0x955390fdbbf4cb69c43791a4f4454dae5b3f4d54028c3dbedc263b0e7e2ab133",
-                    "mixHash" : "0x8a1f233b06ddb3d804304a6aafffedb26df748f1639f56c4268519bc90e92a97",
-                    "nonce" : "0x950c3b903922e3d1",
+                    "hash" : "0xd368fb083012037661c4886e6da2847db77db533d7a8c1e594235c438684c717",
+                    "mixHash" : "0xdcf881572f9b57a11d01314ac68e7b2b8773c57a491113814f3349b068585d26",
+                    "nonce" : "0x4d316ada5130d25b",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0xb19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1a",
-                    "stateRoot" : "0x35ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337",
+                    "receiptTrie" : "0x16da45289df813b179464ae168d5bbfa18a300385b581f721a70ad12dc6c3b2c",
+                    "stateRoot" : "0x6d5dcce0413d09bf78af9e4664b66d9bd597c8ecae8bb77b3c5a51ce4ddf88a2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9b50bd1015cbb6bdb857b6e21980e468f3c18092a08345bd84a92bed67972f5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a0c9b50bd1015cbb6bdb857b6e21980e468f3c18092a08345bd84a92bed67972f5a0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a08a1f233b06ddb3d804304a6aafffedb26df748f1639f56c4268519bc90e92a9788950c3b903922e3d1f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b1ba0ffdb1c820ec7ddda9fdd86657ae77da9e2e283426ee9497937768df3540102aea060b9e83a7e906d5920a5e07e9437c5117c4c184da156a1cd84a5248753f91ea2c0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d5dcce0413d09bf78af9e4664b66d9bd597c8ecae8bb77b3c5a51ce4ddf88a2a0c9b50bd1015cbb6bdb857b6e21980e468f3c18092a08345bd84a92bed67972f5a016da45289df813b179464ae168d5bbfa18a300385b581f721a70ad12dc6c3b2cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a0dcf881572f9b57a11d01314ac68e7b2b8773c57a491113814f3349b068585d26884d316ada5130d25bf882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b1ba0ffdb1c820ec7ddda9fdd86657ae77da9e2e283426ee9497937768df3540102aea060b9e83a7e906d5920a5e07e9437c5117c4c184da156a1cd84a5248753f91ea2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -251,9 +258,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x955390fdbbf4cb69c43791a4f4454dae5b3f4d54028c3dbedc263b0e7e2ab133",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd368fb083012037661c4886e6da2847db77db533d7a8c1e594235c438684c717",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600060006000356203f7a0f1600a55",
@@ -377,10 +391,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d2g1v0_Frontier" : {
+    "RevertOpcodeCalls_d2g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d2g1v0Filler.json"
         },
         "blocks" : [
@@ -392,9 +406,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0157c0",
-                    "hash" : "0xcdc0a54edb7bc22aa87783e5550da4abf77b181d9d6c7fd3056b740342b5a10a",
-                    "mixHash" : "0xf569d5eb5f16ea6023a968e20aefcf6301c7b6603e4c3f23b4abf5f15ca17952",
-                    "nonce" : "0xa5d9c0617fdbc74e",
+                    "hash" : "0x78aea065508f31391b13542a912c7905d6d910986f62ebb622e74e461e21757a",
+                    "mixHash" : "0x11548bef02c5c00ae5a5b88e27884d3ba76d5340a83b4f63959af44f17e75b68",
+                    "nonce" : "0x914a50b58514d0c8",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
                     "receiptTrie" : "0xb19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1a",
@@ -403,7 +417,7 @@
                     "transactionsTrie" : "0xc9b50bd1015cbb6bdb857b6e21980e468f3c18092a08345bd84a92bed67972f5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a0c9b50bd1015cbb6bdb857b6e21980e468f3c18092a08345bd84a92bed67972f5a0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a0f569d5eb5f16ea6023a968e20aefcf6301c7b6603e4c3f23b4abf5f15ca1795288a5d9c0617fdbc74ef882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b1ba0ffdb1c820ec7ddda9fdd86657ae77da9e2e283426ee9497937768df3540102aea060b9e83a7e906d5920a5e07e9437c5117c4c184da156a1cd84a5248753f91ea2c0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a0c9b50bd1015cbb6bdb857b6e21980e468f3c18092a08345bd84a92bed67972f5a0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a011548bef02c5c00ae5a5b88e27884d3ba76d5340a83b4f63959af44f17e75b6888914a50b58514d0c8f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b1ba0ffdb1c820ec7ddda9fdd86657ae77da9e2e283426ee9497937768df3540102aea060b9e83a7e906d5920a5e07e9437c5117c4c184da156a1cd84a5248753f91ea2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -440,8 +454,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcdc0a54edb7bc22aa87783e5550da4abf77b181d9d6c7fd3056b740342b5a10a",
-        "network" : "Frontier",
+        "lastblockhash" : "0x78aea065508f31391b13542a912c7905d6d910986f62ebb622e74e461e21757a",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -566,10 +580,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d2g1v0_Homestead" : {
+    "RevertOpcodeCalls_d2g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d2g1v0Filler.json"
         },
         "blocks" : [
@@ -581,9 +595,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0157c0",
-                    "hash" : "0x3f70dce89a881176d1b5eb286113a1282a0fac78d855ce530ff8e3c97afa0a0b",
-                    "mixHash" : "0x5279839fd8bbbb87757b697293891e476f718c8368a32df88a92a0bf37a2b066",
-                    "nonce" : "0xaca9cac224920043",
+                    "hash" : "0x220bf6d99a34403f695ae9209f21b9d64a8184fcc10a0de357a667c4e81df535",
+                    "mixHash" : "0x17e1fc9c6c240aab8ab6850f86e6b9224442f5638e40f4b05716f003ba560bd5",
+                    "nonce" : "0xc2edbbf7da48315d",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
                     "receiptTrie" : "0xb19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1a",
@@ -592,7 +606,7 @@
                     "transactionsTrie" : "0xc9b50bd1015cbb6bdb857b6e21980e468f3c18092a08345bd84a92bed67972f5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a0c9b50bd1015cbb6bdb857b6e21980e468f3c18092a08345bd84a92bed67972f5a0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a05279839fd8bbbb87757b697293891e476f718c8368a32df88a92a0bf37a2b06688aca9cac224920043f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b1ba0ffdb1c820ec7ddda9fdd86657ae77da9e2e283426ee9497937768df3540102aea060b9e83a7e906d5920a5e07e9437c5117c4c184da156a1cd84a5248753f91ea2c0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a0c9b50bd1015cbb6bdb857b6e21980e468f3c18092a08345bd84a92bed67972f5a0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a017e1fc9c6c240aab8ab6850f86e6b9224442f5638e40f4b05716f003ba560bd588c2edbbf7da48315df882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b1ba0ffdb1c820ec7ddda9fdd86657ae77da9e2e283426ee9497937768df3540102aea060b9e83a7e906d5920a5e07e9437c5117c4c184da156a1cd84a5248753f91ea2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -629,8 +643,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3f70dce89a881176d1b5eb286113a1282a0fac78d855ce530ff8e3c97afa0a0b",
-        "network" : "Homestead",
+        "lastblockhash" : "0x220bf6d99a34403f695ae9209f21b9d64a8184fcc10a0de357a667c4e81df535",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -755,10 +769,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d2g1v0_Metropolis" : {
+    "RevertOpcodeCalls_d2g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d2g1v0Filler.json"
         },
         "blocks" : [
@@ -770,18 +784,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0157c0",
-                    "hash" : "0x5bb7431cf708cca817216c49f13488ef997479f1da542e8d9b63fd660eed1da0",
-                    "mixHash" : "0xd88469a2a48eb8b227d96798a758c24c618766c79822ddbc17549c3b54a66153",
-                    "nonce" : "0x9b2745a695d8b7d6",
+                    "hash" : "0x42976a0a37bb5b4da9155ba9b02cf09e97a3898aad772d3fbdc642a38718b027",
+                    "mixHash" : "0xb4f1f21164062eeca76c38203837b7a9e935460e593079e790159191c7532de6",
+                    "nonce" : "0x407b68309cf5c3b3",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0x16da45289df813b179464ae168d5bbfa18a300385b581f721a70ad12dc6c3b2c",
-                    "stateRoot" : "0x6d5dcce0413d09bf78af9e4664b66d9bd597c8ecae8bb77b3c5a51ce4ddf88a2",
+                    "receiptTrie" : "0xb19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1a",
+                    "stateRoot" : "0x35ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9b50bd1015cbb6bdb857b6e21980e468f3c18092a08345bd84a92bed67972f5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d5dcce0413d09bf78af9e4664b66d9bd597c8ecae8bb77b3c5a51ce4ddf88a2a0c9b50bd1015cbb6bdb857b6e21980e468f3c18092a08345bd84a92bed67972f5a016da45289df813b179464ae168d5bbfa18a300385b581f721a70ad12dc6c3b2cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a0d88469a2a48eb8b227d96798a758c24c618766c79822ddbc17549c3b54a66153889b2745a695d8b7d6f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b1ba0ffdb1c820ec7ddda9fdd86657ae77da9e2e283426ee9497937768df3540102aea060b9e83a7e906d5920a5e07e9437c5117c4c184da156a1cd84a5248753f91ea2c0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a0c9b50bd1015cbb6bdb857b6e21980e468f3c18092a08345bd84a92bed67972f5a0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a0b4f1f21164062eeca76c38203837b7a9e935460e593079e790159191c7532de688407b68309cf5c3b3f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b1ba0ffdb1c820ec7ddda9fdd86657ae77da9e2e283426ee9497937768df3540102aea060b9e83a7e906d5920a5e07e9437c5117c4c184da156a1cd84a5248753f91ea2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -818,16 +832,198 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5bb7431cf708cca817216c49f13488ef997479f1da542e8d9b63fd660eed1da0",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x42976a0a37bb5b4da9155ba9b02cf09e97a3898aad772d3fbdc642a38718b027",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600060006000356203f7a0f1600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f557c0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3b840",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb1005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f2600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb2005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f4600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073b3305374fce5edbc8e2a8697c15331677e6ebf0b620186a0f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3305374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600455600e600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600060006000356203f7a0f1600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb1005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f2600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb2005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f4600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073b3305374fce5edbc8e2a8697c15331677e6ebf0b620186a0f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3305374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600455600e600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeCalls_d2g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d2g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0157c0",
+                    "hash" : "0xcebb9e465af7ea7da9bbdf91ba235185f8b9d9fa81b910a86e520436cd6bb654",
+                    "mixHash" : "0xdc636798f01f722613b04646f91b85a86596bffc84ba50921ae8c693f1847b6b",
+                    "nonce" : "0x0dfa5433b164f204",
+                    "number" : "0x01",
+                    "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
+                    "receiptTrie" : "0xb19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1a",
+                    "stateRoot" : "0x35ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc9b50bd1015cbb6bdb857b6e21980e468f3c18092a08345bd84a92bed67972f5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a0c9b50bd1015cbb6bdb857b6e21980e468f3c18092a08345bd84a92bed67972f5a0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a0dc636798f01f722613b04646f91b85a86596bffc84ba50921ae8c693f1847b6b880dfa5433b164f204f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b1ba0ffdb1c820ec7ddda9fdd86657ae77da9e2e283426ee9497937768df3540102aea060b9e83a7e906d5920a5e07e9437c5117c4c184da156a1cd84a5248753f91ea2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000b2005374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "gasLimit" : "0x0157c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xffdb1c820ec7ddda9fdd86657ae77da9e2e283426ee9497937768df3540102ae",
+                        "s" : "0x60b9e83a7e906d5920a5e07e9437c5117c4c184da156a1cd84a5248753f91ea2",
+                        "to" : "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcebb9e465af7ea7da9bbdf91ba235185f8b9d9fa81b910a86e520436cd6bb654",
+        "network" : "Homestead",
+        "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600060006000356203f7a0f1600a55",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d3g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d3g0v0.json
index 1ccaaa385..8a1835b1e 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d3g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d3g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeCalls_d3g0v0_EIP150" : {
+    "RevertOpcodeCalls_d3g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d3g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x026f2b",
-                    "hash" : "0x15779a7d533d8f78917e8cf41fb58b8b979fdacbd48183f439a59a11bef31976",
-                    "mixHash" : "0x315cf9e8f427c4362c13b72038fde3478dd5516bba9ab8ee588d3804b4aea015",
-                    "nonce" : "0x6f37c8519d7d30dc",
+                    "gasUsed" : "0x01fa0a",
+                    "hash" : "0x1cb51dc1ce144a5b0bf1309961892c6322bea927ee10cbe5bcae401a391b6ec1",
+                    "mixHash" : "0x9d3366ec90511f3dab4f90c06ea9898e5e2aa69718b43a502f79bde050b77fd6",
+                    "nonce" : "0x30e5ae831492f5ca",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0x3c0281d97b7b44fc6c6b4b40c6c0d784268054696bba8add2028d1757daf2f6a",
-                    "stateRoot" : "0x0dba8321e036011e7e4cfb0ee49920197668e6f46205ef6385e73c6a0891f52f",
+                    "receiptTrie" : "0xde822081f094716e4bab01d4acc17ac1209de742caae350852fcaf659d110a8c",
+                    "stateRoot" : "0xe7aff0d5a9f48553b748b0f2110d62494743b7244ad31d48b8e89ae546990f06",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf1334da3ddfc41252466471dc87e8d04a213a9127244555674e702b4278b024f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00dba8321e036011e7e4cfb0ee49920197668e6f46205ef6385e73c6a0891f52fa0f1334da3ddfc41252466471dc87e8d04a213a9127244555674e702b4278b024fa03c0281d97b7b44fc6c6b4b40c6c0d784268054696bba8add2028d1757daf2f6ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083026f2b8203e880a0315cf9e8f427c4362c13b72038fde3478dd5516bba9ab8ee588d3804b4aea015886f37c8519d7d30dcf882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b1ca0e4c30784e3ea9401375e38a5c952707892750640e6c18a265ee1d4ece0fab033a02537e80e3fb18a558d4ae12c72fce4f219e35892db25090bd041cf48df4fe962c0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7aff0d5a9f48553b748b0f2110d62494743b7244ad31d48b8e89ae546990f06a0f1334da3ddfc41252466471dc87e8d04a213a9127244555674e702b4278b024fa0de822081f094716e4bab01d4acc17ac1209de742caae350852fcaf659d110a8cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301fa0a8203e880a09d3366ec90511f3dab4f90c06ea9898e5e2aa69718b43a502f79bde050b77fd68830e5ae831492f5caf882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b1ca0e4c30784e3ea9401375e38a5c952707892750640e6c18a265ee1d4ece0fab033a02537e80e3fb18a558d4ae12c72fce4f219e35892db25090bd041cf48df4fe962c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x15779a7d533d8f78917e8cf41fb58b8b979fdacbd48183f439a59a11bef31976",
-        "network" : "EIP150",
+        "lastblockhash" : "0x1cb51dc1ce144a5b0bf1309961892c6322bea927ee10cbe5bcae401a391b6ec1",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600060006000356203f7a0f1600a55",
@@ -74,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f66f2b",
+                "balance" : "0x4563918244f5fa0a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2a0d5",
+                "balance" : "0xe8d4a315f6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -192,10 +199,210 @@
             }
         }
     },
-    "RevertOpcodeCalls_d3g0v0_EIP158" : {
+    "RevertOpcodeCalls_d3g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d3g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01fa0a",
+                    "hash" : "0xcac57a6037f9f37383411d21591418292f8f68ff59a4af3664a7b86185dc2dea",
+                    "mixHash" : "0xaad6f4a2260e6491fbe4841da7498bc76a7fb699b7a34e056b0b8cc593e3f0b2",
+                    "nonce" : "0x2da8ad86a8ebafdb",
+                    "number" : "0x01",
+                    "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
+                    "receiptTrie" : "0xde822081f094716e4bab01d4acc17ac1209de742caae350852fcaf659d110a8c",
+                    "stateRoot" : "0xe7aff0d5a9f48553b748b0f2110d62494743b7244ad31d48b8e89ae546990f06",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf1334da3ddfc41252466471dc87e8d04a213a9127244555674e702b4278b024f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7aff0d5a9f48553b748b0f2110d62494743b7244ad31d48b8e89ae546990f06a0f1334da3ddfc41252466471dc87e8d04a213a9127244555674e702b4278b024fa0de822081f094716e4bab01d4acc17ac1209de742caae350852fcaf659d110a8cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301fa0a8203e880a0aad6f4a2260e6491fbe4841da7498bc76a7fb699b7a34e056b0b8cc593e3f0b2882da8ad86a8ebafdbf882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b1ca0e4c30784e3ea9401375e38a5c952707892750640e6c18a265ee1d4ece0fab033a02537e80e3fb18a558d4ae12c72fce4f219e35892db25090bd041cf48df4fe962c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "gasLimit" : "0x0704e0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe4c30784e3ea9401375e38a5c952707892750640e6c18a265ee1d4ece0fab033",
+                        "s" : "0x2537e80e3fb18a558d4ae12c72fce4f219e35892db25090bd041cf48df4fe962",
+                        "to" : "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcac57a6037f9f37383411d21591418292f8f68ff59a4af3664a7b86185dc2dea",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600060006000356203f7a0f1600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x0a" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5fa0a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a315f6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb1005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f2600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb2005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f4600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073b3305374fce5edbc8e2a8697c15331677e6ebf0b620186a0f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x02" : "0x0e"
+                }
+            },
+            "0xb3305374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600455600e600555",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x05" : "0x0e"
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600060006000356203f7a0f1600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb1005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f2600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb2005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f4600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073b3305374fce5edbc8e2a8697c15331677e6ebf0b620186a0f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3305374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600455600e600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeCalls_d3g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d3g0v0Filler.json"
         },
         "blocks" : [
@@ -207,9 +414,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x026f2b",
-                    "hash" : "0x54c82285e1b92a004144dff77ec3e5bebb52d0d2bf3171d20022395c2f48222f",
-                    "mixHash" : "0x020868f80b45f156b18e85a48ed4a9c1c73ffa08418d88832e4f2720bd06d556",
-                    "nonce" : "0x53b0423ce1c8c5ac",
+                    "hash" : "0x661c092596dc1a07a81a3915d17cef3545e7b5daa5240f106151b2eb72042a18",
+                    "mixHash" : "0xcfa69c4a9d843e8d1c82aa1612a8b2ec72a54697e8fe3174694aebeac35de22a",
+                    "nonce" : "0x529756ba9c84d1b3",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
                     "receiptTrie" : "0x3c0281d97b7b44fc6c6b4b40c6c0d784268054696bba8add2028d1757daf2f6a",
@@ -218,7 +425,7 @@
                     "transactionsTrie" : "0xf1334da3ddfc41252466471dc87e8d04a213a9127244555674e702b4278b024f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00dba8321e036011e7e4cfb0ee49920197668e6f46205ef6385e73c6a0891f52fa0f1334da3ddfc41252466471dc87e8d04a213a9127244555674e702b4278b024fa03c0281d97b7b44fc6c6b4b40c6c0d784268054696bba8add2028d1757daf2f6ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083026f2b8203e880a0020868f80b45f156b18e85a48ed4a9c1c73ffa08418d88832e4f2720bd06d5568853b0423ce1c8c5acf882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b1ca0e4c30784e3ea9401375e38a5c952707892750640e6c18a265ee1d4ece0fab033a02537e80e3fb18a558d4ae12c72fce4f219e35892db25090bd041cf48df4fe962c0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00dba8321e036011e7e4cfb0ee49920197668e6f46205ef6385e73c6a0891f52fa0f1334da3ddfc41252466471dc87e8d04a213a9127244555674e702b4278b024fa03c0281d97b7b44fc6c6b4b40c6c0d784268054696bba8add2028d1757daf2f6ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083026f2b8203e880a0cfa69c4a9d843e8d1c82aa1612a8b2ec72a54697e8fe3174694aebeac35de22a88529756ba9c84d1b3f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b1ca0e4c30784e3ea9401375e38a5c952707892750640e6c18a265ee1d4ece0fab033a02537e80e3fb18a558d4ae12c72fce4f219e35892db25090bd041cf48df4fe962c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -255,8 +462,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x54c82285e1b92a004144dff77ec3e5bebb52d0d2bf3171d20022395c2f48222f",
-        "network" : "EIP158",
+        "lastblockhash" : "0x661c092596dc1a07a81a3915d17cef3545e7b5daa5240f106151b2eb72042a18",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -385,10 +592,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d3g0v0_Frontier" : {
+    "RevertOpcodeCalls_d3g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d3g0v0Filler.json"
         },
         "blocks" : [
@@ -399,19 +606,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x02676f",
-                    "hash" : "0xec44477f85787181eeacde00b4e3594746c9fd07e235922bb244269fa585a64e",
-                    "mixHash" : "0x0173564ea99f6b9d57fa8355189eb6a151b7b0f045c31eaa0b492e32d90cfcd6",
-                    "nonce" : "0x215340307dff81d7",
+                    "gasUsed" : "0x026f2b",
+                    "hash" : "0xea92f3df5ea2dfcee4f3839e7540e9389add646da6bad9a4d86737d2e1459779",
+                    "mixHash" : "0x528fe536e4c5795502b377ac90857e899438b8fdd1defb39cfed12c120342876",
+                    "nonce" : "0x7a8d595aedcd15d1",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0x7b5367d77d7a4cffd36286442799455a86810cc70bec3f309274e2a98241d6b0",
-                    "stateRoot" : "0x7698095cdb312f1515cad2b87457a30f80e89d9d0aaf0c4c9552b4f680341430",
+                    "receiptTrie" : "0x3c0281d97b7b44fc6c6b4b40c6c0d784268054696bba8add2028d1757daf2f6a",
+                    "stateRoot" : "0x0dba8321e036011e7e4cfb0ee49920197668e6f46205ef6385e73c6a0891f52f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf1334da3ddfc41252466471dc87e8d04a213a9127244555674e702b4278b024f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07698095cdb312f1515cad2b87457a30f80e89d9d0aaf0c4c9552b4f680341430a0f1334da3ddfc41252466471dc87e8d04a213a9127244555674e702b4278b024fa07b5367d77d7a4cffd36286442799455a86810cc70bec3f309274e2a98241d6b0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302676f8203e880a00173564ea99f6b9d57fa8355189eb6a151b7b0f045c31eaa0b492e32d90cfcd688215340307dff81d7f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b1ca0e4c30784e3ea9401375e38a5c952707892750640e6c18a265ee1d4ece0fab033a02537e80e3fb18a558d4ae12c72fce4f219e35892db25090bd041cf48df4fe962c0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00dba8321e036011e7e4cfb0ee49920197668e6f46205ef6385e73c6a0891f52fa0f1334da3ddfc41252466471dc87e8d04a213a9127244555674e702b4278b024fa03c0281d97b7b44fc6c6b4b40c6c0d784268054696bba8add2028d1757daf2f6ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083026f2b8203e880a0528fe536e4c5795502b377ac90857e899438b8fdd1defb39cfed12c120342876887a8d595aedcd15d1f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b1ca0e4c30784e3ea9401375e38a5c952707892750640e6c18a265ee1d4ece0fab033a02537e80e3fb18a558d4ae12c72fce4f219e35892db25090bd041cf48df4fe962c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -448,8 +655,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xec44477f85787181eeacde00b4e3594746c9fd07e235922bb244269fa585a64e",
-        "network" : "Frontier",
+        "lastblockhash" : "0xea92f3df5ea2dfcee4f3839e7540e9389add646da6bad9a4d86737d2e1459779",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -460,14 +667,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f6676f",
+                "balance" : "0x4563918244f66f2b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2a891",
+                "balance" : "0xe8d4a2a0d5",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -578,10 +785,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d3g0v0_Homestead" : {
+    "RevertOpcodeCalls_d3g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d3g0v0Filler.json"
         },
         "blocks" : [
@@ -593,9 +800,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02676f",
-                    "hash" : "0xb9472dd9000cae6085e79b123e2a44b46b8a6ea2996933ca76d78514e2c37eef",
-                    "mixHash" : "0xfc50b3ca79d4edb9a6e38809b303d6e9d9bf1ebbb6676d52d6bea80d2350ad9a",
-                    "nonce" : "0x806778bc76401c08",
+                    "hash" : "0x5ddbeffea4a7c2f50f687b57a2cdf8148e909b220f48c8d889e352de3250880c",
+                    "mixHash" : "0xd6c3b2985d2ad8434f1bd2c2e500775fd5477b0e6795d7c0f6930ed79858fa8e",
+                    "nonce" : "0x2a41c1735af7bb62",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
                     "receiptTrie" : "0x7b5367d77d7a4cffd36286442799455a86810cc70bec3f309274e2a98241d6b0",
@@ -604,7 +811,7 @@
                     "transactionsTrie" : "0xf1334da3ddfc41252466471dc87e8d04a213a9127244555674e702b4278b024f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07698095cdb312f1515cad2b87457a30f80e89d9d0aaf0c4c9552b4f680341430a0f1334da3ddfc41252466471dc87e8d04a213a9127244555674e702b4278b024fa07b5367d77d7a4cffd36286442799455a86810cc70bec3f309274e2a98241d6b0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302676f8203e880a0fc50b3ca79d4edb9a6e38809b303d6e9d9bf1ebbb6676d52d6bea80d2350ad9a88806778bc76401c08f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b1ca0e4c30784e3ea9401375e38a5c952707892750640e6c18a265ee1d4ece0fab033a02537e80e3fb18a558d4ae12c72fce4f219e35892db25090bd041cf48df4fe962c0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07698095cdb312f1515cad2b87457a30f80e89d9d0aaf0c4c9552b4f680341430a0f1334da3ddfc41252466471dc87e8d04a213a9127244555674e702b4278b024fa07b5367d77d7a4cffd36286442799455a86810cc70bec3f309274e2a98241d6b0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302676f8203e880a0d6c3b2985d2ad8434f1bd2c2e500775fd5477b0e6795d7c0f6930ed79858fa8e882a41c1735af7bb62f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b1ca0e4c30784e3ea9401375e38a5c952707892750640e6c18a265ee1d4ece0fab033a02537e80e3fb18a558d4ae12c72fce4f219e35892db25090bd041cf48df4fe962c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -641,8 +848,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb9472dd9000cae6085e79b123e2a44b46b8a6ea2996933ca76d78514e2c37eef",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5ddbeffea4a7c2f50f687b57a2cdf8148e909b220f48c8d889e352de3250880c",
+        "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -771,10 +978,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d3g0v0_Metropolis" : {
+    "RevertOpcodeCalls_d3g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d3g0v0Filler.json"
         },
         "blocks" : [
@@ -785,19 +992,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01fa0a",
-                    "hash" : "0x0243c4dca0c4040796dd5b3b86a7c303288f048f15a7859b30ef946d9f4e08b3",
-                    "mixHash" : "0xcc8ebfe3baf0699fec8dc6ec231c18b43bf991708522e06137923a2c1da325a0",
-                    "nonce" : "0xc572457fb8bc5971",
+                    "gasUsed" : "0x02676f",
+                    "hash" : "0x562e97b6272840bed473a889674893573e623c12d86775e5251bddc77dca8b8b",
+                    "mixHash" : "0xda0f05e3ef2db229e7ca2932f2c06197b9c4bc4454c57bbf6a978fddca3b90fd",
+                    "nonce" : "0x817ec3243023d2cf",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0xde822081f094716e4bab01d4acc17ac1209de742caae350852fcaf659d110a8c",
-                    "stateRoot" : "0xe7aff0d5a9f48553b748b0f2110d62494743b7244ad31d48b8e89ae546990f06",
+                    "receiptTrie" : "0x7b5367d77d7a4cffd36286442799455a86810cc70bec3f309274e2a98241d6b0",
+                    "stateRoot" : "0x7698095cdb312f1515cad2b87457a30f80e89d9d0aaf0c4c9552b4f680341430",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf1334da3ddfc41252466471dc87e8d04a213a9127244555674e702b4278b024f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7aff0d5a9f48553b748b0f2110d62494743b7244ad31d48b8e89ae546990f06a0f1334da3ddfc41252466471dc87e8d04a213a9127244555674e702b4278b024fa0de822081f094716e4bab01d4acc17ac1209de742caae350852fcaf659d110a8cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301fa0a8203e880a0cc8ebfe3baf0699fec8dc6ec231c18b43bf991708522e06137923a2c1da325a088c572457fb8bc5971f882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b1ca0e4c30784e3ea9401375e38a5c952707892750640e6c18a265ee1d4ece0fab033a02537e80e3fb18a558d4ae12c72fce4f219e35892db25090bd041cf48df4fe962c0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07698095cdb312f1515cad2b87457a30f80e89d9d0aaf0c4c9552b4f680341430a0f1334da3ddfc41252466471dc87e8d04a213a9127244555674e702b4278b024fa07b5367d77d7a4cffd36286442799455a86810cc70bec3f309274e2a98241d6b0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302676f8203e880a0da0f05e3ef2db229e7ca2932f2c06197b9c4bc4454c57bbf6a978fddca3b90fd88817ec3243023d2cff882f8808001830704e094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b1ca0e4c30784e3ea9401375e38a5c952707892750640e6c18a265ee1d4ece0fab033a02537e80e3fb18a558d4ae12c72fce4f219e35892db25090bd041cf48df4fe962c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -834,16 +1041,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0243c4dca0c4040796dd5b3b86a7c303288f048f15a7859b30ef946d9f4e08b3",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x562e97b6272840bed473a889674893573e623c12d86775e5251bddc77dca8b8b",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600060006000356203f7a0f1600a55",
@@ -853,14 +1053,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5fa0a",
+                "balance" : "0x4563918244f6676f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a315f6",
+                "balance" : "0xe8d4a2a891",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d3g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d3g1v0.json
index 758137178..3cc0b015e 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d3g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCalls_d3g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeCalls_d3g1v0_EIP150" : {
+    "RevertOpcodeCalls_d3g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d3g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0157c0",
-                    "hash" : "0x1d736c40853441c05bdc6fdf4a72127f5362fb59e0f8a37644768729b21c7186",
-                    "mixHash" : "0x7f57e28641289166fa13a7740dbf0d991ce74d6eaf1d970d9a069f449957366c",
-                    "nonce" : "0x27b04f54abf3ca45",
+                    "hash" : "0xd0ca048d4cccc2ef12fd0db39b4584105ae3e3fcef9daf7baf34edc763172715",
+                    "mixHash" : "0x9936c3bd885f2427070d6c6154c3d8d9a009edeade0f0bc9500a890d199dfd42",
+                    "nonce" : "0xb4d150ee3fe928a5",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0xb19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1a",
-                    "stateRoot" : "0x35ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337",
+                    "receiptTrie" : "0x16da45289df813b179464ae168d5bbfa18a300385b581f721a70ad12dc6c3b2c",
+                    "stateRoot" : "0x6d5dcce0413d09bf78af9e4664b66d9bd597c8ecae8bb77b3c5a51ce4ddf88a2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x37169e49521e67c32581b1f56cfadeaeb42a7738efbba3b3c1766d40f420287d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a037169e49521e67c32581b1f56cfadeaeb42a7738efbba3b3c1766d40f420287da0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a07f57e28641289166fa13a7740dbf0d991ce74d6eaf1d970d9a069f449957366c8827b04f54abf3ca45f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b1ca06c70f29ca908d47fdb4a08d0b62601d0a83c0ede41cd0003293fcd39edb91765a0744cb1bab7629571953582c74a5a0b842a5e3f04eb9e78a9f29bae9183263352c0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d5dcce0413d09bf78af9e4664b66d9bd597c8ecae8bb77b3c5a51ce4ddf88a2a037169e49521e67c32581b1f56cfadeaeb42a7738efbba3b3c1766d40f420287da016da45289df813b179464ae168d5bbfa18a300385b581f721a70ad12dc6c3b2cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a09936c3bd885f2427070d6c6154c3d8d9a009edeade0f0bc9500a890d199dfd4288b4d150ee3fe928a5f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b1ca06c70f29ca908d47fdb4a08d0b62601d0a83c0ede41cd0003293fcd39edb91765a0744cb1bab7629571953582c74a5a0b842a5e3f04eb9e78a9f29bae9183263352c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1d736c40853441c05bdc6fdf4a72127f5362fb59e0f8a37644768729b21c7186",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd0ca048d4cccc2ef12fd0db39b4584105ae3e3fcef9daf7baf34edc763172715",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600060006000356203f7a0f1600a55",
@@ -188,10 +195,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d3g1v0_EIP158" : {
+    "RevertOpcodeCalls_d3g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d3g1v0Filler.json"
         },
         "blocks" : [
@@ -203,18 +210,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0157c0",
-                    "hash" : "0xe8ba2458c9e49ed32bd12c522fb15ed30d5e0cc371c903839e775be8b9bc8316",
-                    "mixHash" : "0xf39f4b7ec4fda8be9b566608d3b71ad7ad67acf09d4614423f8399697d545409",
-                    "nonce" : "0x4c0a8f79a27cf43c",
+                    "hash" : "0x7b26ce131ec03465449e40ab71bb1591443bee1ceecacb8b5b7c5f91fa93e83c",
+                    "mixHash" : "0x2cab497b6aa266b06cd39409da89f742fabf65b2ce12c757ba4135807c64cfdd",
+                    "nonce" : "0xc40652a799d518f6",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0xb19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1a",
-                    "stateRoot" : "0x35ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337",
+                    "receiptTrie" : "0x16da45289df813b179464ae168d5bbfa18a300385b581f721a70ad12dc6c3b2c",
+                    "stateRoot" : "0x6d5dcce0413d09bf78af9e4664b66d9bd597c8ecae8bb77b3c5a51ce4ddf88a2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x37169e49521e67c32581b1f56cfadeaeb42a7738efbba3b3c1766d40f420287d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a037169e49521e67c32581b1f56cfadeaeb42a7738efbba3b3c1766d40f420287da0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a0f39f4b7ec4fda8be9b566608d3b71ad7ad67acf09d4614423f8399697d545409884c0a8f79a27cf43cf882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b1ca06c70f29ca908d47fdb4a08d0b62601d0a83c0ede41cd0003293fcd39edb91765a0744cb1bab7629571953582c74a5a0b842a5e3f04eb9e78a9f29bae9183263352c0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d5dcce0413d09bf78af9e4664b66d9bd597c8ecae8bb77b3c5a51ce4ddf88a2a037169e49521e67c32581b1f56cfadeaeb42a7738efbba3b3c1766d40f420287da016da45289df813b179464ae168d5bbfa18a300385b581f721a70ad12dc6c3b2cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a02cab497b6aa266b06cd39409da89f742fabf65b2ce12c757ba4135807c64cfdd88c40652a799d518f6f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b1ca06c70f29ca908d47fdb4a08d0b62601d0a83c0ede41cd0003293fcd39edb91765a0744cb1bab7629571953582c74a5a0b842a5e3f04eb9e78a9f29bae9183263352c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -251,9 +258,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe8ba2458c9e49ed32bd12c522fb15ed30d5e0cc371c903839e775be8b9bc8316",
-        "network" : "EIP158",
+        "lastblockhash" : "0x7b26ce131ec03465449e40ab71bb1591443bee1ceecacb8b5b7c5f91fa93e83c",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600060006000356203f7a0f1600a55",
@@ -377,10 +391,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d3g1v0_Frontier" : {
+    "RevertOpcodeCalls_d3g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d3g1v0Filler.json"
         },
         "blocks" : [
@@ -392,9 +406,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0157c0",
-                    "hash" : "0x13d214b96fe3c6c548c8714f7264829c73cc414d821a878ba078e30e5bf6ab4f",
-                    "mixHash" : "0x42f19e5a7ff6c9c663e343d25f4326adbe6810889a45e95b249d8f42b63907b2",
-                    "nonce" : "0xd304a48bb450c7de",
+                    "hash" : "0x8ba4224db9cedeb2ca84a39ba179c27af5799bb74336b765305349c9370ff28c",
+                    "mixHash" : "0x3319486e77e8c8ae1aa479445f4db507090131f7e7bee7d9f8fd60b79806a9ec",
+                    "nonce" : "0x78c6a01322bc1e54",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
                     "receiptTrie" : "0xb19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1a",
@@ -403,7 +417,7 @@
                     "transactionsTrie" : "0x37169e49521e67c32581b1f56cfadeaeb42a7738efbba3b3c1766d40f420287d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a037169e49521e67c32581b1f56cfadeaeb42a7738efbba3b3c1766d40f420287da0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a042f19e5a7ff6c9c663e343d25f4326adbe6810889a45e95b249d8f42b63907b288d304a48bb450c7def882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b1ca06c70f29ca908d47fdb4a08d0b62601d0a83c0ede41cd0003293fcd39edb91765a0744cb1bab7629571953582c74a5a0b842a5e3f04eb9e78a9f29bae9183263352c0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a037169e49521e67c32581b1f56cfadeaeb42a7738efbba3b3c1766d40f420287da0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a03319486e77e8c8ae1aa479445f4db507090131f7e7bee7d9f8fd60b79806a9ec8878c6a01322bc1e54f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b1ca06c70f29ca908d47fdb4a08d0b62601d0a83c0ede41cd0003293fcd39edb91765a0744cb1bab7629571953582c74a5a0b842a5e3f04eb9e78a9f29bae9183263352c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -440,8 +454,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x13d214b96fe3c6c548c8714f7264829c73cc414d821a878ba078e30e5bf6ab4f",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8ba4224db9cedeb2ca84a39ba179c27af5799bb74336b765305349c9370ff28c",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -566,10 +580,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d3g1v0_Homestead" : {
+    "RevertOpcodeCalls_d3g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d3g1v0Filler.json"
         },
         "blocks" : [
@@ -581,9 +595,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0157c0",
-                    "hash" : "0x55465152dfd57786dd7271a79099eca56eb19eaa981c32b64eb029f123bd6ead",
-                    "mixHash" : "0x9938bb23ab472a36dea992d87e96ccea2210d0e51fd544fa6766f6ef05d39294",
-                    "nonce" : "0x2d7ac00ee3a53d4b",
+                    "hash" : "0x3a18f0886c89fff30bb2bf7066f019ec6303bf4505595b6865d5f4f8e0cdc369",
+                    "mixHash" : "0xbc3afe28da81e87b5585585cc34e702817982bc19b28823c7b1ab893e371d49a",
+                    "nonce" : "0x57574d733493288d",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
                     "receiptTrie" : "0xb19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1a",
@@ -592,7 +606,7 @@
                     "transactionsTrie" : "0x37169e49521e67c32581b1f56cfadeaeb42a7738efbba3b3c1766d40f420287d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a037169e49521e67c32581b1f56cfadeaeb42a7738efbba3b3c1766d40f420287da0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a09938bb23ab472a36dea992d87e96ccea2210d0e51fd544fa6766f6ef05d39294882d7ac00ee3a53d4bf882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b1ca06c70f29ca908d47fdb4a08d0b62601d0a83c0ede41cd0003293fcd39edb91765a0744cb1bab7629571953582c74a5a0b842a5e3f04eb9e78a9f29bae9183263352c0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a037169e49521e67c32581b1f56cfadeaeb42a7738efbba3b3c1766d40f420287da0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a0bc3afe28da81e87b5585585cc34e702817982bc19b28823c7b1ab893e371d49a8857574d733493288df882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b1ca06c70f29ca908d47fdb4a08d0b62601d0a83c0ede41cd0003293fcd39edb91765a0744cb1bab7629571953582c74a5a0b842a5e3f04eb9e78a9f29bae9183263352c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -629,8 +643,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x55465152dfd57786dd7271a79099eca56eb19eaa981c32b64eb029f123bd6ead",
-        "network" : "Homestead",
+        "lastblockhash" : "0x3a18f0886c89fff30bb2bf7066f019ec6303bf4505595b6865d5f4f8e0cdc369",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -755,10 +769,10 @@
             }
         }
     },
-    "RevertOpcodeCalls_d3g1v0_Metropolis" : {
+    "RevertOpcodeCalls_d3g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d3g1v0Filler.json"
         },
         "blocks" : [
@@ -770,18 +784,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0157c0",
-                    "hash" : "0x1ff7fad6910d4818f17c563127521ecaa823524c3fac964a029ce5f07a9aada2",
-                    "mixHash" : "0xa24864341ede862da4bd4af52bd474245740d82fa5804e26707c81fbe0aeb34e",
-                    "nonce" : "0x353be35d1957d493",
+                    "hash" : "0x76b45c800e81e877e2849bb383e9c75d02f593847933d2e471177dac2186afb6",
+                    "mixHash" : "0xaadaea06883cf58f8cbd1b1a64791c51f9628c1f9916f12dabd074e76b0dc6ff",
+                    "nonce" : "0x1913a42768c7734f",
                     "number" : "0x01",
                     "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
-                    "receiptTrie" : "0x16da45289df813b179464ae168d5bbfa18a300385b581f721a70ad12dc6c3b2c",
-                    "stateRoot" : "0x6d5dcce0413d09bf78af9e4664b66d9bd597c8ecae8bb77b3c5a51ce4ddf88a2",
+                    "receiptTrie" : "0xb19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1a",
+                    "stateRoot" : "0x35ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x37169e49521e67c32581b1f56cfadeaeb42a7738efbba3b3c1766d40f420287d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d5dcce0413d09bf78af9e4664b66d9bd597c8ecae8bb77b3c5a51ce4ddf88a2a037169e49521e67c32581b1f56cfadeaeb42a7738efbba3b3c1766d40f420287da016da45289df813b179464ae168d5bbfa18a300385b581f721a70ad12dc6c3b2cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a0a24864341ede862da4bd4af52bd474245740d82fa5804e26707c81fbe0aeb34e88353be35d1957d493f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b1ca06c70f29ca908d47fdb4a08d0b62601d0a83c0ede41cd0003293fcd39edb91765a0744cb1bab7629571953582c74a5a0b842a5e3f04eb9e78a9f29bae9183263352c0",
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a037169e49521e67c32581b1f56cfadeaeb42a7738efbba3b3c1766d40f420287da0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a0aadaea06883cf58f8cbd1b1a64791c51f9628c1f9916f12dabd074e76b0dc6ff881913a42768c7734ff882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b1ca06c70f29ca908d47fdb4a08d0b62601d0a83c0ede41cd0003293fcd39edb91765a0744cb1bab7629571953582c74a5a0b842a5e3f04eb9e78a9f29bae9183263352c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -818,16 +832,198 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1ff7fad6910d4818f17c563127521ecaa823524c3fac964a029ce5f07a9aada2",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x76b45c800e81e877e2849bb383e9c75d02f593847933d2e471177dac2186afb6",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600060006000356203f7a0f1600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f557c0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3b840",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb1005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f2600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb2005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f4600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073b3305374fce5edbc8e2a8697c15331677e6ebf0b620186a0f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3305374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600455600e600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600060006000356203f7a0f1600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb0005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb1005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f2600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb2005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f4600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3005374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073b3305374fce5edbc8e2a8697c15331677e6ebf0b620186a0f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb3305374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600455600e600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeCalls_d3g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCalls_d3g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0157c0",
+                    "hash" : "0xe0dbfed96e366e62355dc3d10cc39191d10e3515eb74732103f5be0176843d8b",
+                    "mixHash" : "0x37a6f60ae07eaad438524396c346ca1058b3cb43c95e6e0146a842949d9e1a21",
+                    "nonce" : "0x39c96b6dc3b5f006",
+                    "number" : "0x01",
+                    "parentHash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
+                    "receiptTrie" : "0xb19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1a",
+                    "stateRoot" : "0x35ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x37169e49521e67c32581b1f56cfadeaeb42a7738efbba3b3c1766d40f420287d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a03d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035ba26b60db7bb96de7377a9aafe1095ccd985fd6661539d57b6d77e7c866337a037169e49521e67c32581b1f56cfadeaeb42a7738efbba3b3c1766d40f420287da0b19e76b93aa93976624b864ef4e1afed8aa739062ce61dd58c0d8d15658a2b1ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830157c08203e880a037a6f60ae07eaad438524396c346ca1058b3cb43c95e6e0146a842949d9e1a218839c96b6dc3b5f006f882f8808001830157c094094f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b1ca06c70f29ca908d47fdb4a08d0b62601d0a83c0ede41cd0003293fcd39edb91765a0744cb1bab7629571953582c74a5a0b842a5e3f04eb9e78a9f29bae9183263352c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000b3005374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "gasLimit" : "0x0157c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6c70f29ca908d47fdb4a08d0b62601d0a83c0ede41cd0003293fcd39edb91765",
+                        "s" : "0x744cb1bab7629571953582c74a5a0b842a5e3f04eb9e78a9f29bae9183263352",
+                        "to" : "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3d23f3321aa60db20cd62d74915666e70851d53b9dbae130999dce23908a26b7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0964f111b34cef56d5dc1e12c817ef046e9298b02aaba7582ea5f2e957638fff1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe0dbfed96e366e62355dc3d10cc39191d10e3515eb74732103f5be0176843d8b",
+        "network" : "Homestead",
+        "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x600060006000600060006000356203f7a0f1600a55",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCreate_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCreate_d0g0v0.json
index 076c9479e..6e386f81a 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCreate_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCreate_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeCreate_d0g0v0_EIP150" : {
+    "RevertOpcodeCreate_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/stRevertTest/RevertOpcodeCreate_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0704e0",
-                    "hash" : "0xc5973f8204d5ee51f272b4a8a30b0ba9700a2c9ebfb0ccefadc2a2ae9b3a13c7",
-                    "mixHash" : "0xf282281cae33c3933fb65aae4a6186659468b9771669367303e65846d7bf7227",
-                    "nonce" : "0x3309bcf711f4ec0b",
+                    "gasUsed" : "0x018279",
+                    "hash" : "0x490850d45d63cd0354de102d5ae14621a7c7bfcbc5853f8b726f296b439780af",
+                    "mixHash" : "0x8112d3c97db4243765d87ac5e61c5768cfc4b96f9c16a50ff8564a6b2783cb92",
+                    "nonce" : "0xfa3ab1a9e543e5dc",
                     "number" : "0x01",
                     "parentHash" : "0xa2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfd",
-                    "receiptTrie" : "0xc9328fae2592a228e8da810f7b7dab86bb2e64d5cc767f914c5887555f04e8af",
-                    "stateRoot" : "0xde4f2a61cd5b8463a8741f673f00ae08358e1d04abcd734c1eab77b4403903e1",
+                    "receiptTrie" : "0x99b8126e99be4509ea2aaf34652da14e714ab030ae70ce25da8ad720ec4fc397",
+                    "stateRoot" : "0xc1d358ebed06a4f49ff5cf1a0ca46e41482ed48f2cb3260d08f8ac44377c59c4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3000f7730192ab3e91fae67fd3cf1fe98649895f8633bcfeca26bb53b8b89914",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff901f8a0a2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de4f2a61cd5b8463a8741f673f00ae08358e1d04abcd734c1eab77b4403903e1a03000f7730192ab3e91fae67fd3cf1fe98649895f8633bcfeca26bb53b8b89914a0c9328fae2592a228e8da810f7b7dab86bb2e64d5cc767f914c5887555f04e8afb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830704e08203e880a0f282281cae33c3933fb65aae4a6186659468b9771669367303e65846d7bf7227883309bcf711f4ec0bf871f86f8001830704e094b94f5374fce5edbc8e2a8697c15331677e6ebf0b808f600160005560016000fe60116001551ba0817f0565657dfb3c1ac27e92eb3b785b8451ab6b01916a9df24c4623eca4a420a05afe4c23c8da174642c5ebf7ef647ae90f0bab87d31b1a817ba034003d350332c0",
+                "rlp" : "0xf9026ff901f8a0a2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1d358ebed06a4f49ff5cf1a0ca46e41482ed48f2cb3260d08f8ac44377c59c4a03000f7730192ab3e91fae67fd3cf1fe98649895f8633bcfeca26bb53b8b89914a099b8126e99be4509ea2aaf34652da14e714ab030ae70ce25da8ad720ec4fc397b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830182798203e880a08112d3c97db4243765d87ac5e61c5768cfc4b96f9c16a50ff8564a6b2783cb9288fa3ab1a9e543e5dcf871f86f8001830704e094b94f5374fce5edbc8e2a8697c15331677e6ebf0b808f600160005560016000fe60116001551ba0817f0565657dfb3c1ac27e92eb3b785b8451ab6b01916a9df24c4623eca4a420a05afe4c23c8da174642c5ebf7ef647ae90f0bab87d31b1a817ba034003d350332c0",
                 "transactions" : [
                     {
                         "data" : "0x600160005560016000fe6011600155",
@@ -62,18 +62,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e04bd3822d22a858789a166ce4e77dd4322ef4b98e0d9bc1a2382e095753f92ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc5973f8204d5ee51f272b4a8a30b0ba9700a2c9ebfb0ccefadc2a2ae9b3a13c7",
-        "network" : "EIP150",
+        "lastblockhash" : "0x490850d45d63cd0354de102d5ae14621a7c7bfcbc5853f8b726f296b439780af",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fb04e0",
+                "balance" : "0x4563918244f58279",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d49e0b20",
+                "balance" : "0xe8d4a38d87",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -82,10 +89,124 @@
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x6e600160005560016000fd6011600155600052600f60116001f0600155600c600055",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x0c"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6e600160005560016000fd6011600155600052600f60116001f0600155600c600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             }
+        }
+    },
+    "RevertOpcodeCreate_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCreate_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x018279",
+                    "hash" : "0x2e30c620e9ba822237f9ef9a6ae6843efa93d552b558cff7b766e6729f412d7c",
+                    "mixHash" : "0x57361172fd9df55eef32f90d9241aaa975f8be4c7d94b532bf8bd5a7189117cd",
+                    "nonce" : "0xbc2566bb025029b1",
+                    "number" : "0x01",
+                    "parentHash" : "0xa2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfd",
+                    "receiptTrie" : "0x99b8126e99be4509ea2aaf34652da14e714ab030ae70ce25da8ad720ec4fc397",
+                    "stateRoot" : "0xc1d358ebed06a4f49ff5cf1a0ca46e41482ed48f2cb3260d08f8ac44377c59c4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3000f7730192ab3e91fae67fd3cf1fe98649895f8633bcfeca26bb53b8b89914",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9026ff901f8a0a2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1d358ebed06a4f49ff5cf1a0ca46e41482ed48f2cb3260d08f8ac44377c59c4a03000f7730192ab3e91fae67fd3cf1fe98649895f8633bcfeca26bb53b8b89914a099b8126e99be4509ea2aaf34652da14e714ab030ae70ce25da8ad720ec4fc397b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830182798203e880a057361172fd9df55eef32f90d9241aaa975f8be4c7d94b532bf8bd5a7189117cd88bc2566bb025029b1f871f86f8001830704e094b94f5374fce5edbc8e2a8697c15331677e6ebf0b808f600160005560016000fe60116001551ba0817f0565657dfb3c1ac27e92eb3b785b8451ab6b01916a9df24c4623eca4a420a05afe4c23c8da174642c5ebf7ef647ae90f0bab87d31b1a817ba034003d350332c0",
+                "transactions" : [
+                    {
+                        "data" : "0x600160005560016000fe6011600155",
+                        "gasLimit" : "0x0704e0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x817f0565657dfb3c1ac27e92eb3b785b8451ab6b01916a9df24c4623eca4a420",
+                        "s" : "0x5afe4c23c8da174642c5ebf7ef647ae90f0bab87d31b1a817ba034003d350332",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xa2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe04bd3822d22a858789a166ce4e77dd4322ef4b98e0d9bc1a2382e095753f92e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e04bd3822d22a858789a166ce4e77dd4322ef4b98e0d9bc1a2382e095753f92ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2e30c620e9ba822237f9ef9a6ae6843efa93d552b558cff7b766e6729f412d7c",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f58279",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a38d87",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6e600160005560016000fd6011600155600052600f60116001f0600155600c600055",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x0c"
+                }
+            }
         },
         "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -104,10 +225,10 @@
             }
         }
     },
-    "RevertOpcodeCreate_d0g0v0_EIP158" : {
+    "RevertOpcodeCreate_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/stRevertTest/RevertOpcodeCreate_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0704e0",
-                    "hash" : "0x8ca0f240d6c9ba36970241fff731710461bcd769eedf5a0d016702755b8c7f08",
-                    "mixHash" : "0x1d87f265b5243eb4680f10981a6a17a8f6f7fcc8bc0e9b10fb5c3fc886ff883c",
-                    "nonce" : "0x97778d593c4e7ebd",
+                    "hash" : "0x804f9e5d71a5629d2fb196b34cacfaebb309b28562764da4751706f175ac3dbe",
+                    "mixHash" : "0x7c1cce4be2407f82cdaf0b215b03b9df983188306289569ea425e5093b7daea1",
+                    "nonce" : "0x95a8d0afca85b782",
                     "number" : "0x01",
                     "parentHash" : "0xa2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfd",
                     "receiptTrie" : "0xc9328fae2592a228e8da810f7b7dab86bb2e64d5cc767f914c5887555f04e8af",
@@ -130,7 +251,7 @@
                     "transactionsTrie" : "0x3000f7730192ab3e91fae67fd3cf1fe98649895f8633bcfeca26bb53b8b89914",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff901f8a0a2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de4f2a61cd5b8463a8741f673f00ae08358e1d04abcd734c1eab77b4403903e1a03000f7730192ab3e91fae67fd3cf1fe98649895f8633bcfeca26bb53b8b89914a0c9328fae2592a228e8da810f7b7dab86bb2e64d5cc767f914c5887555f04e8afb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830704e08203e880a01d87f265b5243eb4680f10981a6a17a8f6f7fcc8bc0e9b10fb5c3fc886ff883c8897778d593c4e7ebdf871f86f8001830704e094b94f5374fce5edbc8e2a8697c15331677e6ebf0b808f600160005560016000fe60116001551ba0817f0565657dfb3c1ac27e92eb3b785b8451ab6b01916a9df24c4623eca4a420a05afe4c23c8da174642c5ebf7ef647ae90f0bab87d31b1a817ba034003d350332c0",
+                "rlp" : "0xf9026ff901f8a0a2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de4f2a61cd5b8463a8741f673f00ae08358e1d04abcd734c1eab77b4403903e1a03000f7730192ab3e91fae67fd3cf1fe98649895f8633bcfeca26bb53b8b89914a0c9328fae2592a228e8da810f7b7dab86bb2e64d5cc767f914c5887555f04e8afb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830704e08203e880a07c1cce4be2407f82cdaf0b215b03b9df983188306289569ea425e5093b7daea18895a8d0afca85b782f871f86f8001830704e094b94f5374fce5edbc8e2a8697c15331677e6ebf0b808f600160005560016000fe60116001551ba0817f0565657dfb3c1ac27e92eb3b785b8451ab6b01916a9df24c4623eca4a420a05afe4c23c8da174642c5ebf7ef647ae90f0bab87d31b1a817ba034003d350332c0",
                 "transactions" : [
                     {
                         "data" : "0x600160005560016000fe6011600155",
@@ -167,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e04bd3822d22a858789a166ce4e77dd4322ef4b98e0d9bc1a2382e095753f92ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8ca0f240d6c9ba36970241fff731710461bcd769eedf5a0d016702755b8c7f08",
-        "network" : "EIP158",
+        "lastblockhash" : "0x804f9e5d71a5629d2fb196b34cacfaebb309b28562764da4751706f175ac3dbe",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fb04e0",
@@ -209,10 +330,10 @@
             }
         }
     },
-    "RevertOpcodeCreate_d0g0v0_Frontier" : {
+    "RevertOpcodeCreate_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/stRevertTest/RevertOpcodeCreate_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +345,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0704e0",
-                    "hash" : "0xe8af81569c7f4955478e7d350e15c1104b0bf4f08452058476f92ad4202b514a",
-                    "mixHash" : "0xa7c0f8b179fe402e0feec442b1c1ced775a13c0b8ece270ca2ad57af085623d6",
-                    "nonce" : "0xc8fa03677e778d07",
+                    "hash" : "0x41c14804710e56a290780cc94677d9c8fa17064841eab552578fa26fbd4731ae",
+                    "mixHash" : "0xcad520e2e7edec5bbf14513d8c85d3b328d4ef9465683b90fd4caab68019775e",
+                    "nonce" : "0xc7b1cb605f09c010",
                     "number" : "0x01",
                     "parentHash" : "0xa2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfd",
                     "receiptTrie" : "0xc9328fae2592a228e8da810f7b7dab86bb2e64d5cc767f914c5887555f04e8af",
@@ -235,7 +356,7 @@
                     "transactionsTrie" : "0x3000f7730192ab3e91fae67fd3cf1fe98649895f8633bcfeca26bb53b8b89914",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff901f8a0a2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de4f2a61cd5b8463a8741f673f00ae08358e1d04abcd734c1eab77b4403903e1a03000f7730192ab3e91fae67fd3cf1fe98649895f8633bcfeca26bb53b8b89914a0c9328fae2592a228e8da810f7b7dab86bb2e64d5cc767f914c5887555f04e8afb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830704e08203e880a0a7c0f8b179fe402e0feec442b1c1ced775a13c0b8ece270ca2ad57af085623d688c8fa03677e778d07f871f86f8001830704e094b94f5374fce5edbc8e2a8697c15331677e6ebf0b808f600160005560016000fe60116001551ba0817f0565657dfb3c1ac27e92eb3b785b8451ab6b01916a9df24c4623eca4a420a05afe4c23c8da174642c5ebf7ef647ae90f0bab87d31b1a817ba034003d350332c0",
+                "rlp" : "0xf9026ff901f8a0a2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de4f2a61cd5b8463a8741f673f00ae08358e1d04abcd734c1eab77b4403903e1a03000f7730192ab3e91fae67fd3cf1fe98649895f8633bcfeca26bb53b8b89914a0c9328fae2592a228e8da810f7b7dab86bb2e64d5cc767f914c5887555f04e8afb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830704e08203e880a0cad520e2e7edec5bbf14513d8c85d3b328d4ef9465683b90fd4caab68019775e88c7b1cb605f09c010f871f86f8001830704e094b94f5374fce5edbc8e2a8697c15331677e6ebf0b808f600160005560016000fe60116001551ba0817f0565657dfb3c1ac27e92eb3b785b8451ab6b01916a9df24c4623eca4a420a05afe4c23c8da174642c5ebf7ef647ae90f0bab87d31b1a817ba034003d350332c0",
                 "transactions" : [
                     {
                         "data" : "0x600160005560016000fe6011600155",
@@ -272,8 +393,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e04bd3822d22a858789a166ce4e77dd4322ef4b98e0d9bc1a2382e095753f92ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe8af81569c7f4955478e7d350e15c1104b0bf4f08452058476f92ad4202b514a",
-        "network" : "Frontier",
+        "lastblockhash" : "0x41c14804710e56a290780cc94677d9c8fa17064841eab552578fa26fbd4731ae",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fb04e0",
@@ -314,10 +435,10 @@
             }
         }
     },
-    "RevertOpcodeCreate_d0g0v0_Homestead" : {
+    "RevertOpcodeCreate_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/stRevertTest/RevertOpcodeCreate_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +450,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0704e0",
-                    "hash" : "0x01daf5ca5e685fdcb0042fd2da6d32bc9aef092e3608e9ef862a118f9749851f",
-                    "mixHash" : "0xbf036c6a6ddffe9b964cc7b438104e63b13dc81e2a4568bd9be7111f5f1a74a8",
-                    "nonce" : "0xaa13328027605c39",
+                    "hash" : "0x9241a2adade4efbe2264754f568a3a9ffe38db7f4a3c33104e41f3186337736b",
+                    "mixHash" : "0x26af68e2233526013de7dc90d6c1aed6675d54638ad02c787ca5a825c63b62a5",
+                    "nonce" : "0x6d61abe664ef5cc0",
                     "number" : "0x01",
                     "parentHash" : "0xa2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfd",
                     "receiptTrie" : "0xc9328fae2592a228e8da810f7b7dab86bb2e64d5cc767f914c5887555f04e8af",
@@ -340,7 +461,7 @@
                     "transactionsTrie" : "0x3000f7730192ab3e91fae67fd3cf1fe98649895f8633bcfeca26bb53b8b89914",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff901f8a0a2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de4f2a61cd5b8463a8741f673f00ae08358e1d04abcd734c1eab77b4403903e1a03000f7730192ab3e91fae67fd3cf1fe98649895f8633bcfeca26bb53b8b89914a0c9328fae2592a228e8da810f7b7dab86bb2e64d5cc767f914c5887555f04e8afb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830704e08203e880a0bf036c6a6ddffe9b964cc7b438104e63b13dc81e2a4568bd9be7111f5f1a74a888aa13328027605c39f871f86f8001830704e094b94f5374fce5edbc8e2a8697c15331677e6ebf0b808f600160005560016000fe60116001551ba0817f0565657dfb3c1ac27e92eb3b785b8451ab6b01916a9df24c4623eca4a420a05afe4c23c8da174642c5ebf7ef647ae90f0bab87d31b1a817ba034003d350332c0",
+                "rlp" : "0xf9026ff901f8a0a2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de4f2a61cd5b8463a8741f673f00ae08358e1d04abcd734c1eab77b4403903e1a03000f7730192ab3e91fae67fd3cf1fe98649895f8633bcfeca26bb53b8b89914a0c9328fae2592a228e8da810f7b7dab86bb2e64d5cc767f914c5887555f04e8afb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830704e08203e880a026af68e2233526013de7dc90d6c1aed6675d54638ad02c787ca5a825c63b62a5886d61abe664ef5cc0f871f86f8001830704e094b94f5374fce5edbc8e2a8697c15331677e6ebf0b808f600160005560016000fe60116001551ba0817f0565657dfb3c1ac27e92eb3b785b8451ab6b01916a9df24c4623eca4a420a05afe4c23c8da174642c5ebf7ef647ae90f0bab87d31b1a817ba034003d350332c0",
                 "transactions" : [
                     {
                         "data" : "0x600160005560016000fe6011600155",
@@ -377,8 +498,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e04bd3822d22a858789a166ce4e77dd4322ef4b98e0d9bc1a2382e095753f92ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x01daf5ca5e685fdcb0042fd2da6d32bc9aef092e3608e9ef862a118f9749851f",
-        "network" : "Homestead",
+        "lastblockhash" : "0x9241a2adade4efbe2264754f568a3a9ffe38db7f4a3c33104e41f3186337736b",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244fb04e0",
@@ -419,10 +540,10 @@
             }
         }
     },
-    "RevertOpcodeCreate_d0g0v0_Metropolis" : {
+    "RevertOpcodeCreate_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCreate_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -433,19 +554,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x018279",
-                    "hash" : "0x5e31f2bad5437ac0c969f99214ea8a712083398e667845bf9e9554433f13ca0b",
-                    "mixHash" : "0x2103a5d81576097571f2b726ef49ceb8a48e2476827a931acc4585845c480b19",
-                    "nonce" : "0x4cf24ca7122f9e7c",
+                    "gasUsed" : "0x0704e0",
+                    "hash" : "0x1942f1021277db2995afa2c6ae36b899fa2f368aa022dcab4ef26be1ce83af66",
+                    "mixHash" : "0x43f3a12841ae0cc751837b11cbad9b3d34097d13a3b79124ff5f42b5c6b71d3c",
+                    "nonce" : "0xc7e23eae5227f8a6",
                     "number" : "0x01",
                     "parentHash" : "0xa2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfd",
-                    "receiptTrie" : "0x99b8126e99be4509ea2aaf34652da14e714ab030ae70ce25da8ad720ec4fc397",
-                    "stateRoot" : "0xc1d358ebed06a4f49ff5cf1a0ca46e41482ed48f2cb3260d08f8ac44377c59c4",
+                    "receiptTrie" : "0xc9328fae2592a228e8da810f7b7dab86bb2e64d5cc767f914c5887555f04e8af",
+                    "stateRoot" : "0xde4f2a61cd5b8463a8741f673f00ae08358e1d04abcd734c1eab77b4403903e1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3000f7730192ab3e91fae67fd3cf1fe98649895f8633bcfeca26bb53b8b89914",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff901f8a0a2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1d358ebed06a4f49ff5cf1a0ca46e41482ed48f2cb3260d08f8ac44377c59c4a03000f7730192ab3e91fae67fd3cf1fe98649895f8633bcfeca26bb53b8b89914a099b8126e99be4509ea2aaf34652da14e714ab030ae70ce25da8ad720ec4fc397b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830182798203e880a02103a5d81576097571f2b726ef49ceb8a48e2476827a931acc4585845c480b19884cf24ca7122f9e7cf871f86f8001830704e094b94f5374fce5edbc8e2a8697c15331677e6ebf0b808f600160005560016000fe60116001551ba0817f0565657dfb3c1ac27e92eb3b785b8451ab6b01916a9df24c4623eca4a420a05afe4c23c8da174642c5ebf7ef647ae90f0bab87d31b1a817ba034003d350332c0",
+                "rlp" : "0xf9026ff901f8a0a2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de4f2a61cd5b8463a8741f673f00ae08358e1d04abcd734c1eab77b4403903e1a03000f7730192ab3e91fae67fd3cf1fe98649895f8633bcfeca26bb53b8b89914a0c9328fae2592a228e8da810f7b7dab86bb2e64d5cc767f914c5887555f04e8afb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830704e08203e880a043f3a12841ae0cc751837b11cbad9b3d34097d13a3b79124ff5f42b5c6b71d3c88c7e23eae5227f8a6f871f86f8001830704e094b94f5374fce5edbc8e2a8697c15331677e6ebf0b808f600160005560016000fe60116001551ba0817f0565657dfb3c1ac27e92eb3b785b8451ab6b01916a9df24c4623eca4a420a05afe4c23c8da174642c5ebf7ef647ae90f0bab87d31b1a817ba034003d350332c0",
                 "transactions" : [
                     {
                         "data" : "0x600160005560016000fe6011600155",
@@ -482,25 +603,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e04bd3822d22a858789a166ce4e77dd4322ef4b98e0d9bc1a2382e095753f92ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5e31f2bad5437ac0c969f99214ea8a712083398e667845bf9e9554433f13ca0b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x1942f1021277db2995afa2c6ae36b899fa2f368aa022dcab4ef26be1ce83af66",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f58279",
+                "balance" : "0x4563918244fb04e0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a38d87",
+                "balance" : "0xe8d49e0b20",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -509,9 +623,8 @@
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x6e600160005560016000fd6011600155600052600f60116001f0600155600c600055",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x0c"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCreate_d0g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCreate_d0g1v0.json
index bb90c277c..b31554f3c 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCreate_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeCreate_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeCreate_d0g1v0_EIP150" : {
+    "RevertOpcodeCreate_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCreate_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0x4849ecdc3585a9d04619ed1aa41c67e402eadcf56a141e1157ef55d5ce6f541d",
-                    "mixHash" : "0x9459c5ad04c540e91676a565f4420e7871e7392ffb8db66e38ae4a79ddfba547",
-                    "nonce" : "0xc955eecb97d1104a",
+                    "hash" : "0x0b416427e6c2683e468c085cf17021a2af4077d2e9b96c3fee53322a9193a408",
+                    "mixHash" : "0xec3e691ab1140205e930643c24118609cb49b47a7f88e835fec1cd6ffd489a04",
+                    "nonce" : "0xf6b1274fde8a9d02",
                     "number" : "0x01",
                     "parentHash" : "0xa2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfd",
-                    "receiptTrie" : "0x07eee56a5087e209871081cb6fa7fd15d255341e03113cfffee084a3bdfeab8f",
-                    "stateRoot" : "0x6448f6453aeab2abb2fbccc85ee2263b60bb77ecd0d0eba1c8caf4f46ef70e51",
+                    "receiptTrie" : "0x33206fdb0b04af73aed5fcc49c377894a2ad7acc74a06782884999e9c75de4ba",
+                    "stateRoot" : "0x1c52ca492840237edb00e9dbd4b602ba878fdb772626c255cca7f66e58aaf96e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x304ece29243d3ee1875450ad9767809511b17b0395dd7fe5bb16db7914c306f1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff901f8a0a2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06448f6453aeab2abb2fbccc85ee2263b60bb77ecd0d0eba1c8caf4f46ef70e51a0304ece29243d3ee1875450ad9767809511b17b0395dd7fe5bb16db7914c306f1a007eee56a5087e209871081cb6fa7fd15d255341e03113cfffee084a3bdfeab8fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a09459c5ad04c540e91676a565f4420e7871e7392ffb8db66e38ae4a79ddfba54788c955eecb97d1104af871f86f80018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b808f600160005560016000fe60116001551ba08cf1c95021ba82caf65e283687f3089cdcfeb55b8bff25d36d902bc6d989911da05c232f85f4187001617f88537508f48f925b6dbe384958293486893b3cdd88ffc0",
+                "rlp" : "0xf9026ff901f8a0a2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c52ca492840237edb00e9dbd4b602ba878fdb772626c255cca7f66e58aaf96ea0304ece29243d3ee1875450ad9767809511b17b0395dd7fe5bb16db7914c306f1a033206fdb0b04af73aed5fcc49c377894a2ad7acc74a06782884999e9c75de4bab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0ec3e691ab1140205e930643c24118609cb49b47a7f88e835fec1cd6ffd489a0488f6b1274fde8a9d02f871f86f80018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b808f600160005560016000fe60116001551ba08cf1c95021ba82caf65e283687f3089cdcfeb55b8bff25d36d902bc6d989911da05c232f85f4187001617f88537508f48f925b6dbe384958293486893b3cdd88ffc0",
                 "transactions" : [
                     {
                         "data" : "0x600160005560016000fe6011600155",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e04bd3822d22a858789a166ce4e77dd4322ef4b98e0d9bc1a2382e095753f92ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4849ecdc3585a9d04619ed1aa41c67e402eadcf56a141e1157ef55d5ce6f541d",
-        "network" : "EIP150",
+        "lastblockhash" : "0x0b416427e6c2683e468c085cf17021a2af4077d2e9b96c3fee53322a9193a408",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51170",
                 "code" : "",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "RevertOpcodeCreate_d0g1v0_EIP158" : {
+    "RevertOpcodeCreate_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCreate_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0x61e2626dfffcab64c275fdee8d11d74dd1613e6713dd042db58e948f271ccc54",
-                    "mixHash" : "0xdf5c81b353c564ac45153d36abe72b9ff468ead41fcb49ecb8f7e1cb729595ed",
-                    "nonce" : "0x5049b5d85f0b9576",
+                    "hash" : "0xe9b9d2711ca593e249a63fd696d994fc6ef7dded8b55985ab1e6fcd7fcb1a8eb",
+                    "mixHash" : "0x0f6c82bd37afa2d4965392aae1127b869ae13958a387877f70e96ebf14d9bff1",
+                    "nonce" : "0x5dd3a3cc11989d43",
                     "number" : "0x01",
                     "parentHash" : "0xa2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfd",
-                    "receiptTrie" : "0x07eee56a5087e209871081cb6fa7fd15d255341e03113cfffee084a3bdfeab8f",
-                    "stateRoot" : "0x6448f6453aeab2abb2fbccc85ee2263b60bb77ecd0d0eba1c8caf4f46ef70e51",
+                    "receiptTrie" : "0x33206fdb0b04af73aed5fcc49c377894a2ad7acc74a06782884999e9c75de4ba",
+                    "stateRoot" : "0x1c52ca492840237edb00e9dbd4b602ba878fdb772626c255cca7f66e58aaf96e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x304ece29243d3ee1875450ad9767809511b17b0395dd7fe5bb16db7914c306f1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff901f8a0a2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06448f6453aeab2abb2fbccc85ee2263b60bb77ecd0d0eba1c8caf4f46ef70e51a0304ece29243d3ee1875450ad9767809511b17b0395dd7fe5bb16db7914c306f1a007eee56a5087e209871081cb6fa7fd15d255341e03113cfffee084a3bdfeab8fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0df5c81b353c564ac45153d36abe72b9ff468ead41fcb49ecb8f7e1cb729595ed885049b5d85f0b9576f871f86f80018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b808f600160005560016000fe60116001551ba08cf1c95021ba82caf65e283687f3089cdcfeb55b8bff25d36d902bc6d989911da05c232f85f4187001617f88537508f48f925b6dbe384958293486893b3cdd88ffc0",
+                "rlp" : "0xf9026ff901f8a0a2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c52ca492840237edb00e9dbd4b602ba878fdb772626c255cca7f66e58aaf96ea0304ece29243d3ee1875450ad9767809511b17b0395dd7fe5bb16db7914c306f1a033206fdb0b04af73aed5fcc49c377894a2ad7acc74a06782884999e9c75de4bab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a00f6c82bd37afa2d4965392aae1127b869ae13958a387877f70e96ebf14d9bff1885dd3a3cc11989d43f871f86f80018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b808f600160005560016000fe60116001551ba08cf1c95021ba82caf65e283687f3089cdcfeb55b8bff25d36d902bc6d989911da05c232f85f4187001617f88537508f48f925b6dbe384958293486893b3cdd88ffc0",
                 "transactions" : [
                     {
                         "data" : "0x600160005560016000fe6011600155",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e04bd3822d22a858789a166ce4e77dd4322ef4b98e0d9bc1a2382e095753f92ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x61e2626dfffcab64c275fdee8d11d74dd1613e6713dd042db58e948f271ccc54",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe9b9d2711ca593e249a63fd696d994fc6ef7dded8b55985ab1e6fcd7fcb1a8eb",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51170",
                 "code" : "",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "RevertOpcodeCreate_d0g1v0_Frontier" : {
+    "RevertOpcodeCreate_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCreate_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0xbaae738229209bbcbadfa988df25fbd537548e576812edb0e6caad5da2fc7efc",
-                    "mixHash" : "0xd243c754d6037e7ae43a4e744778f9bc096438c0da5ac89d6959ccfadb173efe",
-                    "nonce" : "0x469be18d226a77d6",
+                    "hash" : "0x5a4627c2698bcfb68e09494594b1441471c748e7862a686314451a57362d2212",
+                    "mixHash" : "0x6f452a53b8b8104d0be3bd9324cf76e1e67b790f2408da3d2c84bbd625a1e4ac",
+                    "nonce" : "0xf0dcdd6329f03fea",
                     "number" : "0x01",
                     "parentHash" : "0xa2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfd",
                     "receiptTrie" : "0x07eee56a5087e209871081cb6fa7fd15d255341e03113cfffee084a3bdfeab8f",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x304ece29243d3ee1875450ad9767809511b17b0395dd7fe5bb16db7914c306f1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff901f8a0a2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06448f6453aeab2abb2fbccc85ee2263b60bb77ecd0d0eba1c8caf4f46ef70e51a0304ece29243d3ee1875450ad9767809511b17b0395dd7fe5bb16db7914c306f1a007eee56a5087e209871081cb6fa7fd15d255341e03113cfffee084a3bdfeab8fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0d243c754d6037e7ae43a4e744778f9bc096438c0da5ac89d6959ccfadb173efe88469be18d226a77d6f871f86f80018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b808f600160005560016000fe60116001551ba08cf1c95021ba82caf65e283687f3089cdcfeb55b8bff25d36d902bc6d989911da05c232f85f4187001617f88537508f48f925b6dbe384958293486893b3cdd88ffc0",
+                "rlp" : "0xf9026ff901f8a0a2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06448f6453aeab2abb2fbccc85ee2263b60bb77ecd0d0eba1c8caf4f46ef70e51a0304ece29243d3ee1875450ad9767809511b17b0395dd7fe5bb16db7914c306f1a007eee56a5087e209871081cb6fa7fd15d255341e03113cfffee084a3bdfeab8fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a06f452a53b8b8104d0be3bd9324cf76e1e67b790f2408da3d2c84bbd625a1e4ac88f0dcdd6329f03feaf871f86f80018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b808f600160005560016000fe60116001551ba08cf1c95021ba82caf65e283687f3089cdcfeb55b8bff25d36d902bc6d989911da05c232f85f4187001617f88537508f48f925b6dbe384958293486893b3cdd88ffc0",
                 "transactions" : [
                     {
                         "data" : "0x600160005560016000fe6011600155",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e04bd3822d22a858789a166ce4e77dd4322ef4b98e0d9bc1a2382e095753f92ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbaae738229209bbcbadfa988df25fbd537548e576812edb0e6caad5da2fc7efc",
-        "network" : "Frontier",
+        "lastblockhash" : "0x5a4627c2698bcfb68e09494594b1441471c748e7862a686314451a57362d2212",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51170",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "RevertOpcodeCreate_d0g1v0_Homestead" : {
+    "RevertOpcodeCreate_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCreate_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0xea994694b276fbbb08ad1c27e7451fcade1027a53075686e8da201048a8d387e",
-                    "mixHash" : "0xcfc4f477fb136802e3e34baeb5b8a1bfaeb88ff03f4c1277bf4360768f1d2596",
-                    "nonce" : "0x76ada841e6f3d925",
+                    "hash" : "0x18f7c2ac9b12556836993d805dd57158f9b170b1ff5a7e333fee124b0a728d57",
+                    "mixHash" : "0xc5d65832d7acde0b648b0ee42f7a7414d9095e30a562e9a4d5e4dfe663db38c5",
+                    "nonce" : "0xbaec71049448e7ce",
                     "number" : "0x01",
                     "parentHash" : "0xa2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfd",
                     "receiptTrie" : "0x07eee56a5087e209871081cb6fa7fd15d255341e03113cfffee084a3bdfeab8f",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x304ece29243d3ee1875450ad9767809511b17b0395dd7fe5bb16db7914c306f1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff901f8a0a2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06448f6453aeab2abb2fbccc85ee2263b60bb77ecd0d0eba1c8caf4f46ef70e51a0304ece29243d3ee1875450ad9767809511b17b0395dd7fe5bb16db7914c306f1a007eee56a5087e209871081cb6fa7fd15d255341e03113cfffee084a3bdfeab8fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0cfc4f477fb136802e3e34baeb5b8a1bfaeb88ff03f4c1277bf4360768f1d25968876ada841e6f3d925f871f86f80018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b808f600160005560016000fe60116001551ba08cf1c95021ba82caf65e283687f3089cdcfeb55b8bff25d36d902bc6d989911da05c232f85f4187001617f88537508f48f925b6dbe384958293486893b3cdd88ffc0",
+                "rlp" : "0xf9026ff901f8a0a2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06448f6453aeab2abb2fbccc85ee2263b60bb77ecd0d0eba1c8caf4f46ef70e51a0304ece29243d3ee1875450ad9767809511b17b0395dd7fe5bb16db7914c306f1a007eee56a5087e209871081cb6fa7fd15d255341e03113cfffee084a3bdfeab8fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0c5d65832d7acde0b648b0ee42f7a7414d9095e30a562e9a4d5e4dfe663db38c588baec71049448e7cef871f86f80018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b808f600160005560016000fe60116001551ba08cf1c95021ba82caf65e283687f3089cdcfeb55b8bff25d36d902bc6d989911da05c232f85f4187001617f88537508f48f925b6dbe384958293486893b3cdd88ffc0",
                 "transactions" : [
                     {
                         "data" : "0x600160005560016000fe6011600155",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e04bd3822d22a858789a166ce4e77dd4322ef4b98e0d9bc1a2382e095753f92ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xea994694b276fbbb08ad1c27e7451fcade1027a53075686e8da201048a8d387e",
-        "network" : "Homestead",
+        "lastblockhash" : "0x18f7c2ac9b12556836993d805dd57158f9b170b1ff5a7e333fee124b0a728d57",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51170",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "RevertOpcodeCreate_d0g1v0_Metropolis" : {
+    "RevertOpcodeCreate_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCreate_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0xb5939a2f4fb5f489543ee1897a6f8b2e69aa36a7b8c2b81283c800e4e3931e9c",
-                    "mixHash" : "0x5f94bf274402eea4b13185c63363f3a2ddadec2ebbfb71760fbd1e9871c7c669",
-                    "nonce" : "0xb202b795b18ea560",
+                    "hash" : "0x084d044823e60fc99d06d6ba91ea661eac1b9ab17adafdfd84178cf20c2c3b03",
+                    "mixHash" : "0x95be9138efcb919579f249c56bd1d846c125897116848b6e91a443e8fafe96ef",
+                    "nonce" : "0xb28a1e5929c3af72",
                     "number" : "0x01",
                     "parentHash" : "0xa2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfd",
-                    "receiptTrie" : "0x33206fdb0b04af73aed5fcc49c377894a2ad7acc74a06782884999e9c75de4ba",
-                    "stateRoot" : "0x1c52ca492840237edb00e9dbd4b602ba878fdb772626c255cca7f66e58aaf96e",
+                    "receiptTrie" : "0x07eee56a5087e209871081cb6fa7fd15d255341e03113cfffee084a3bdfeab8f",
+                    "stateRoot" : "0x6448f6453aeab2abb2fbccc85ee2263b60bb77ecd0d0eba1c8caf4f46ef70e51",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x304ece29243d3ee1875450ad9767809511b17b0395dd7fe5bb16db7914c306f1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff901f8a0a2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c52ca492840237edb00e9dbd4b602ba878fdb772626c255cca7f66e58aaf96ea0304ece29243d3ee1875450ad9767809511b17b0395dd7fe5bb16db7914c306f1a033206fdb0b04af73aed5fcc49c377894a2ad7acc74a06782884999e9c75de4bab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a05f94bf274402eea4b13185c63363f3a2ddadec2ebbfb71760fbd1e9871c7c66988b202b795b18ea560f871f86f80018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b808f600160005560016000fe60116001551ba08cf1c95021ba82caf65e283687f3089cdcfeb55b8bff25d36d902bc6d989911da05c232f85f4187001617f88537508f48f925b6dbe384958293486893b3cdd88ffc0",
+                "rlp" : "0xf9026ff901f8a0a2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06448f6453aeab2abb2fbccc85ee2263b60bb77ecd0d0eba1c8caf4f46ef70e51a0304ece29243d3ee1875450ad9767809511b17b0395dd7fe5bb16db7914c306f1a007eee56a5087e209871081cb6fa7fd15d255341e03113cfffee084a3bdfeab8fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a095be9138efcb919579f249c56bd1d846c125897116848b6e91a443e8fafe96ef88b28a1e5929c3af72f871f86f80018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b808f600160005560016000fe60116001551ba08cf1c95021ba82caf65e283687f3089cdcfeb55b8bff25d36d902bc6d989911da05c232f85f4187001617f88537508f48f925b6dbe384958293486893b3cdd88ffc0",
                 "transactions" : [
                     {
                         "data" : "0x600160005560016000fe6011600155",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e04bd3822d22a858789a166ce4e77dd4322ef4b98e0d9bc1a2382e095753f92ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb5939a2f4fb5f489543ee1897a6f8b2e69aa36a7b8c2b81283c800e4e3931e9c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x084d044823e60fc99d06d6ba91ea661eac1b9ab17adafdfd84178cf20c2c3b03",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f51170",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3fe90",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6e600160005560016000fd6011600155600052600f60116001f0600155600c600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6e600160005560016000fd6011600155600052600f60116001f0600155600c600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeCreate_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeCreate_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x011170",
+                    "hash" : "0xf3b61e399b365d646be9be860e693e466a027e4fcfdf6ea0f0141c13d3b83ca4",
+                    "mixHash" : "0x86a519729e92d80fd597537c64725d9c1a0f65153d60610d0a20d5e16157d958",
+                    "nonce" : "0xd88b9a8b392493a4",
+                    "number" : "0x01",
+                    "parentHash" : "0xa2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfd",
+                    "receiptTrie" : "0x07eee56a5087e209871081cb6fa7fd15d255341e03113cfffee084a3bdfeab8f",
+                    "stateRoot" : "0x6448f6453aeab2abb2fbccc85ee2263b60bb77ecd0d0eba1c8caf4f46ef70e51",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x304ece29243d3ee1875450ad9767809511b17b0395dd7fe5bb16db7914c306f1",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9026ff901f8a0a2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06448f6453aeab2abb2fbccc85ee2263b60bb77ecd0d0eba1c8caf4f46ef70e51a0304ece29243d3ee1875450ad9767809511b17b0395dd7fe5bb16db7914c306f1a007eee56a5087e209871081cb6fa7fd15d255341e03113cfffee084a3bdfeab8fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a086a519729e92d80fd597537c64725d9c1a0f65153d60610d0a20d5e16157d95888d88b9a8b392493a4f871f86f80018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b808f600160005560016000fe60116001551ba08cf1c95021ba82caf65e283687f3089cdcfeb55b8bff25d36d902bc6d989911da05c232f85f4187001617f88537508f48f925b6dbe384958293486893b3cdd88ffc0",
+                "transactions" : [
+                    {
+                        "data" : "0x600160005560016000fe6011600155",
+                        "gasLimit" : "0x011170",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8cf1c95021ba82caf65e283687f3089cdcfeb55b8bff25d36d902bc6d989911d",
+                        "s" : "0x5c232f85f4187001617f88537508f48f925b6dbe384958293486893b3cdd88ff",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xa2622bab3c1261d95a08d0ec5168ee421bff090bca4c50d88df561ecdedf3bfd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe04bd3822d22a858789a166ce4e77dd4322ef4b98e0d9bc1a2382e095753f92e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e04bd3822d22a858789a166ce4e77dd4322ef4b98e0d9bc1a2382e095753f92ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf3b61e399b365d646be9be860e693e466a027e4fcfdf6ea0f0141c13d3b83ca4",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51170",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall_d0g0v0.json
index 3345c4d16..979f584c4 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeDirectCall_d0g0v0_EIP150" : {
+    "RevertOpcodeDirectCall_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/stRevertTest/RevertOpcodeDirectCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x017f5a",
-                    "hash" : "0x0fc7bda215d4219387aad36af9f86d5655fcc2fd6471f20d25f72e86d2a502b7",
-                    "mixHash" : "0x4e79b3daba50c5a35a13d9a3ecf4135d9b646ab50e1fc8cc852c22c2b2d4ee27",
-                    "nonce" : "0x4d9e822d811f2f8a",
+                    "gasUsed" : "0x010a39",
+                    "hash" : "0x3c278fcb28867e44b3d60526b75d376178c717abad83b8b4c0e01d271b8a2112",
+                    "mixHash" : "0x9c0279fa2489aa1b46d1ed90f27fef4810cf0a962de90653f941a6b312acb97a",
+                    "nonce" : "0xdf34fe088c87c506",
                     "number" : "0x01",
                     "parentHash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
-                    "receiptTrie" : "0x24c736008d1f4f123abdd4f1e825a7224806944070d9631512112bcf6b795dc3",
-                    "stateRoot" : "0x89a497f036b7fb7f18159ea6f2f146342a72e6d960dc71bf5e92c1db7cb2e25f",
+                    "receiptTrie" : "0xcffbce9f36c17ed9c46a02d715106a07d1fc427681bd2928960b3ef1468c2add",
+                    "stateRoot" : "0x31f82d7ddf659c69dae54aed626e9eedf2ff6ae135414d2a80a13ec703ff98a6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd83b6d993469bf8f2332ec5a12ca945f1ccbc8a21ddff06308062441d71c3920",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089a497f036b7fb7f18159ea6f2f146342a72e6d960dc71bf5e92c1db7cb2e25fa0d83b6d993469bf8f2332ec5a12ca945f1ccbc8a21ddff06308062441d71c3920a024c736008d1f4f123abdd4f1e825a7224806944070d9631512112bcf6b795dc3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083017f5a8203e880a04e79b3daba50c5a35a13d9a3ecf4135d9b646ab50e1fc8cc852c22c2b2d4ee27884d9e822d811f2f8af882f8808001830704e094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ba0fde87b912c5a223e588f5276eedcefefce6e865dab8e8b88cb079102d47c17a2a00d5a6058349b8a3d3ecdfa325a58844506f0c68dcd9b909001dc293631b465f6c0",
+                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa031f82d7ddf659c69dae54aed626e9eedf2ff6ae135414d2a80a13ec703ff98a6a0d83b6d993469bf8f2332ec5a12ca945f1ccbc8a21ddff06308062441d71c3920a0cffbce9f36c17ed9c46a02d715106a07d1fc427681bd2928960b3ef1468c2addb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083010a398203e880a09c0279fa2489aa1b46d1ed90f27fef4810cf0a962de90653f941a6b312acb97a88df34fe088c87c506f882f8808001830704e094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ba0fde87b912c5a223e588f5276eedcefefce6e865dab8e8b88cb079102d47c17a2a00d5a6058349b8a3d3ecdfa325a58844506f0c68dcd9b909001dc293631b465f6c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0fc7bda215d4219387aad36af9f86d5655fcc2fd6471f20d25f72e86d2a502b7",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3c278fcb28867e44b3d60526b75d376178c717abad83b8b4c0e01d271b8a2112",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x6000600060006000600060003561ea60f1600a55",
@@ -73,14 +80,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f57f5a",
+                "balance" : "0x4563918244f50a39",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a390a6",
+                "balance" : "0xe8d4a405c7",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -133,10 +140,151 @@
             }
         }
     },
-    "RevertOpcodeDirectCall_d0g0v0_EIP158" : {
+    "RevertOpcodeDirectCall_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/stRevertTest/RevertOpcodeDirectCall_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x010a39",
+                    "hash" : "0x247ed8210a2a5e800b027380d8c444c6291d96e1c8b615fd38fe8c7bf02ad35f",
+                    "mixHash" : "0x7904b028b3085b2c46f4d499af9e928f061c2d56fa9666d4d9799a47cc97f609",
+                    "nonce" : "0x547b8bbb74996c3c",
+                    "number" : "0x01",
+                    "parentHash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
+                    "receiptTrie" : "0xcffbce9f36c17ed9c46a02d715106a07d1fc427681bd2928960b3ef1468c2add",
+                    "stateRoot" : "0x31f82d7ddf659c69dae54aed626e9eedf2ff6ae135414d2a80a13ec703ff98a6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd83b6d993469bf8f2332ec5a12ca945f1ccbc8a21ddff06308062441d71c3920",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa031f82d7ddf659c69dae54aed626e9eedf2ff6ae135414d2a80a13ec703ff98a6a0d83b6d993469bf8f2332ec5a12ca945f1ccbc8a21ddff06308062441d71c3920a0cffbce9f36c17ed9c46a02d715106a07d1fc427681bd2928960b3ef1468c2addb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083010a398203e880a07904b028b3085b2c46f4d499af9e928f061c2d56fa9666d4d9799a47cc97f60988547b8bbb74996c3cf882f8808001830704e094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ba0fde87b912c5a223e588f5276eedcefefce6e865dab8e8b88cb079102d47c17a2a00d5a6058349b8a3d3ecdfa325a58844506f0c68dcd9b909001dc293631b465f6c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "gasLimit" : "0x0704e0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfde87b912c5a223e588f5276eedcefefce6e865dab8e8b88cb079102d47c17a2",
+                        "s" : "0x0d5a6058349b8a3d3ecdfa325a58844506f0c68dcd9b909001dc293631b465f6",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xdacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x247ed8210a2a5e800b027380d8c444c6291d96e1c8b615fd38fe8c7bf02ad35f",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600060003561ea60f1600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f50a39",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a405c7",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x0e"
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600060003561ea60f1600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeDirectCall_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeDirectCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -148,9 +296,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x017f5a",
-                    "hash" : "0x568e77577d831a3b53130f354f6c49d3c9914f3d33a7df2d75959a1976ca86e9",
-                    "mixHash" : "0xa8a861ab8bae0c0fd12b00327ce0364084865036de18c7a033b8d458c4ccef91",
-                    "nonce" : "0x945c3a8ed968fe12",
+                    "hash" : "0x299cbbea28e7abf3e0a4b0f75c35e51b14390b1d7b52d99586b681cfaeefd52e",
+                    "mixHash" : "0x99c3499cc495d9b6f732c654d028d15c072cdc2e1e9a57344dd4b41b35694b16",
+                    "nonce" : "0xb334ceb4f6fc1d45",
                     "number" : "0x01",
                     "parentHash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
                     "receiptTrie" : "0x24c736008d1f4f123abdd4f1e825a7224806944070d9631512112bcf6b795dc3",
@@ -159,7 +307,7 @@
                     "transactionsTrie" : "0xd83b6d993469bf8f2332ec5a12ca945f1ccbc8a21ddff06308062441d71c3920",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089a497f036b7fb7f18159ea6f2f146342a72e6d960dc71bf5e92c1db7cb2e25fa0d83b6d993469bf8f2332ec5a12ca945f1ccbc8a21ddff06308062441d71c3920a024c736008d1f4f123abdd4f1e825a7224806944070d9631512112bcf6b795dc3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083017f5a8203e880a0a8a861ab8bae0c0fd12b00327ce0364084865036de18c7a033b8d458c4ccef9188945c3a8ed968fe12f882f8808001830704e094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ba0fde87b912c5a223e588f5276eedcefefce6e865dab8e8b88cb079102d47c17a2a00d5a6058349b8a3d3ecdfa325a58844506f0c68dcd9b909001dc293631b465f6c0",
+                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089a497f036b7fb7f18159ea6f2f146342a72e6d960dc71bf5e92c1db7cb2e25fa0d83b6d993469bf8f2332ec5a12ca945f1ccbc8a21ddff06308062441d71c3920a024c736008d1f4f123abdd4f1e825a7224806944070d9631512112bcf6b795dc3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083017f5a8203e880a099c3499cc495d9b6f732c654d028d15c072cdc2e1e9a57344dd4b41b35694b1688b334ceb4f6fc1d45f882f8808001830704e094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ba0fde87b912c5a223e588f5276eedcefefce6e865dab8e8b88cb079102d47c17a2a00d5a6058349b8a3d3ecdfa325a58844506f0c68dcd9b909001dc293631b465f6c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -196,8 +344,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x568e77577d831a3b53130f354f6c49d3c9914f3d33a7df2d75959a1976ca86e9",
-        "network" : "EIP158",
+        "lastblockhash" : "0x299cbbea28e7abf3e0a4b0f75c35e51b14390b1d7b52d99586b681cfaeefd52e",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -267,10 +415,10 @@
             }
         }
     },
-    "RevertOpcodeDirectCall_d0g0v0_Frontier" : {
+    "RevertOpcodeDirectCall_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/stRevertTest/RevertOpcodeDirectCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -281,19 +429,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x017cc6",
-                    "hash" : "0x817be5bbe955f9a75b96e84ee4bcab6b242335d0f1284c52379911a1cf2d1071",
-                    "mixHash" : "0xfa53570d67db81170cc6d0c20f405ec5bef6de4ac2bdb986c95f70f9b8c0584e",
-                    "nonce" : "0xd25281f36192dc1c",
+                    "gasUsed" : "0x017f5a",
+                    "hash" : "0x5e77b1b81258b869c119e48bb3f63d3d7b0472dffa8404422ec5304b41b8e5c9",
+                    "mixHash" : "0x599b4cf63732f629456c4182918abc963e536528b5f7d7df8b46f52fad4b0270",
+                    "nonce" : "0x5ab60baf4d8ad346",
                     "number" : "0x01",
                     "parentHash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
-                    "receiptTrie" : "0x5759dd2a7e8f06bb60b35aad1f9865b80ca65f12fa6b966bc091970794c1010a",
-                    "stateRoot" : "0x14ff97e0540af48fb2be66c9c0c3a1215a9f08555da4d0d04dc76e25f3963d42",
+                    "receiptTrie" : "0x24c736008d1f4f123abdd4f1e825a7224806944070d9631512112bcf6b795dc3",
+                    "stateRoot" : "0x89a497f036b7fb7f18159ea6f2f146342a72e6d960dc71bf5e92c1db7cb2e25f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd83b6d993469bf8f2332ec5a12ca945f1ccbc8a21ddff06308062441d71c3920",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa014ff97e0540af48fb2be66c9c0c3a1215a9f08555da4d0d04dc76e25f3963d42a0d83b6d993469bf8f2332ec5a12ca945f1ccbc8a21ddff06308062441d71c3920a05759dd2a7e8f06bb60b35aad1f9865b80ca65f12fa6b966bc091970794c1010ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083017cc68203e880a0fa53570d67db81170cc6d0c20f405ec5bef6de4ac2bdb986c95f70f9b8c0584e88d25281f36192dc1cf882f8808001830704e094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ba0fde87b912c5a223e588f5276eedcefefce6e865dab8e8b88cb079102d47c17a2a00d5a6058349b8a3d3ecdfa325a58844506f0c68dcd9b909001dc293631b465f6c0",
+                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089a497f036b7fb7f18159ea6f2f146342a72e6d960dc71bf5e92c1db7cb2e25fa0d83b6d993469bf8f2332ec5a12ca945f1ccbc8a21ddff06308062441d71c3920a024c736008d1f4f123abdd4f1e825a7224806944070d9631512112bcf6b795dc3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083017f5a8203e880a0599b4cf63732f629456c4182918abc963e536528b5f7d7df8b46f52fad4b0270885ab60baf4d8ad346f882f8808001830704e094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ba0fde87b912c5a223e588f5276eedcefefce6e865dab8e8b88cb079102d47c17a2a00d5a6058349b8a3d3ecdfa325a58844506f0c68dcd9b909001dc293631b465f6c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -330,8 +478,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x817be5bbe955f9a75b96e84ee4bcab6b242335d0f1284c52379911a1cf2d1071",
-        "network" : "Frontier",
+        "lastblockhash" : "0x5e77b1b81258b869c119e48bb3f63d3d7b0472dffa8404422ec5304b41b8e5c9",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -341,14 +489,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f57cc6",
+                "balance" : "0x4563918244f57f5a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3933a",
+                "balance" : "0xe8d4a390a6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -401,10 +549,10 @@
             }
         }
     },
-    "RevertOpcodeDirectCall_d0g0v0_Homestead" : {
+    "RevertOpcodeDirectCall_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/stRevertTest/RevertOpcodeDirectCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -416,9 +564,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x017cc6",
-                    "hash" : "0x9899e9f410039deafd7f8343a6c4b59fb6346c39733510ac0ded0e2eaaf3b00f",
-                    "mixHash" : "0x81dcce3ee45de997a4c4988c5af15b48969b41b75a652980f858c02fe61119b6",
-                    "nonce" : "0x765dff97b6168d03",
+                    "hash" : "0x76e0e2b28625758fe51c22dec3d13b38b91c729517953340f2d6fce6e993fa65",
+                    "mixHash" : "0xf0202e95bf2770a4606763ee69b7c987306d9ccfa0327d4f35a546d9c0fc7d06",
+                    "nonce" : "0x69e7aa019d3536bd",
                     "number" : "0x01",
                     "parentHash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
                     "receiptTrie" : "0x5759dd2a7e8f06bb60b35aad1f9865b80ca65f12fa6b966bc091970794c1010a",
@@ -427,7 +575,7 @@
                     "transactionsTrie" : "0xd83b6d993469bf8f2332ec5a12ca945f1ccbc8a21ddff06308062441d71c3920",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa014ff97e0540af48fb2be66c9c0c3a1215a9f08555da4d0d04dc76e25f3963d42a0d83b6d993469bf8f2332ec5a12ca945f1ccbc8a21ddff06308062441d71c3920a05759dd2a7e8f06bb60b35aad1f9865b80ca65f12fa6b966bc091970794c1010ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083017cc68203e880a081dcce3ee45de997a4c4988c5af15b48969b41b75a652980f858c02fe61119b688765dff97b6168d03f882f8808001830704e094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ba0fde87b912c5a223e588f5276eedcefefce6e865dab8e8b88cb079102d47c17a2a00d5a6058349b8a3d3ecdfa325a58844506f0c68dcd9b909001dc293631b465f6c0",
+                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa014ff97e0540af48fb2be66c9c0c3a1215a9f08555da4d0d04dc76e25f3963d42a0d83b6d993469bf8f2332ec5a12ca945f1ccbc8a21ddff06308062441d71c3920a05759dd2a7e8f06bb60b35aad1f9865b80ca65f12fa6b966bc091970794c1010ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083017cc68203e880a0f0202e95bf2770a4606763ee69b7c987306d9ccfa0327d4f35a546d9c0fc7d068869e7aa019d3536bdf882f8808001830704e094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ba0fde87b912c5a223e588f5276eedcefefce6e865dab8e8b88cb079102d47c17a2a00d5a6058349b8a3d3ecdfa325a58844506f0c68dcd9b909001dc293631b465f6c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -464,8 +612,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9899e9f410039deafd7f8343a6c4b59fb6346c39733510ac0ded0e2eaaf3b00f",
-        "network" : "Homestead",
+        "lastblockhash" : "0x76e0e2b28625758fe51c22dec3d13b38b91c729517953340f2d6fce6e993fa65",
+        "network" : "Frontier",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -535,10 +683,10 @@
             }
         }
     },
-    "RevertOpcodeDirectCall_d0g0v0_Metropolis" : {
+    "RevertOpcodeDirectCall_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeDirectCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -549,19 +697,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x010a39",
-                    "hash" : "0x54fea15fbcb37c1c4a14fc66b578747f7ad7941e10997162f9b31d3b309fbf19",
-                    "mixHash" : "0xe37aa457adf2e8c78f6d891c77332f00ea485b6882cd56c7db44f87d9b7284e4",
-                    "nonce" : "0xe02ce13fd51490f7",
+                    "gasUsed" : "0x017cc6",
+                    "hash" : "0xecc16ba2eeef78865f74550e380d60994bf4886d7c4f4657d0bac496f6c7f70a",
+                    "mixHash" : "0x3491d95d68023334f358402708c85b6b7f3905cf36897ad7841772178ecc2f1b",
+                    "nonce" : "0xc2309b3e2219d796",
                     "number" : "0x01",
                     "parentHash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
-                    "receiptTrie" : "0xcffbce9f36c17ed9c46a02d715106a07d1fc427681bd2928960b3ef1468c2add",
-                    "stateRoot" : "0x31f82d7ddf659c69dae54aed626e9eedf2ff6ae135414d2a80a13ec703ff98a6",
+                    "receiptTrie" : "0x5759dd2a7e8f06bb60b35aad1f9865b80ca65f12fa6b966bc091970794c1010a",
+                    "stateRoot" : "0x14ff97e0540af48fb2be66c9c0c3a1215a9f08555da4d0d04dc76e25f3963d42",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd83b6d993469bf8f2332ec5a12ca945f1ccbc8a21ddff06308062441d71c3920",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa031f82d7ddf659c69dae54aed626e9eedf2ff6ae135414d2a80a13ec703ff98a6a0d83b6d993469bf8f2332ec5a12ca945f1ccbc8a21ddff06308062441d71c3920a0cffbce9f36c17ed9c46a02d715106a07d1fc427681bd2928960b3ef1468c2addb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083010a398203e880a0e37aa457adf2e8c78f6d891c77332f00ea485b6882cd56c7db44f87d9b7284e488e02ce13fd51490f7f882f8808001830704e094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ba0fde87b912c5a223e588f5276eedcefefce6e865dab8e8b88cb079102d47c17a2a00d5a6058349b8a3d3ecdfa325a58844506f0c68dcd9b909001dc293631b465f6c0",
+                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa014ff97e0540af48fb2be66c9c0c3a1215a9f08555da4d0d04dc76e25f3963d42a0d83b6d993469bf8f2332ec5a12ca945f1ccbc8a21ddff06308062441d71c3920a05759dd2a7e8f06bb60b35aad1f9865b80ca65f12fa6b966bc091970794c1010ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083017cc68203e880a03491d95d68023334f358402708c85b6b7f3905cf36897ad7841772178ecc2f1b88c2309b3e2219d796f882f8808001830704e094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ba0fde87b912c5a223e588f5276eedcefefce6e865dab8e8b88cb079102d47c17a2a00d5a6058349b8a3d3ecdfa325a58844506f0c68dcd9b909001dc293631b465f6c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -598,16 +746,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x54fea15fbcb37c1c4a14fc66b578747f7ad7941e10997162f9b31d3b309fbf19",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xecc16ba2eeef78865f74550e380d60994bf4886d7c4f4657d0bac496f6c7f70a",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x6000600060006000600060003561ea60f1600a55",
@@ -616,14 +757,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50a39",
+                "balance" : "0x4563918244f57cc6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a405c7",
+                "balance" : "0xe8d4a3933a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall_d0g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall_d0g1v0.json
index e916a3374..a1b89c033 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeDirectCall_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeDirectCall_d0g1v0_EIP150" : {
+    "RevertOpcodeDirectCall_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeDirectCall_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0109a0",
-                    "hash" : "0x599ff68fa3e77cea83f376866c97fc90ebbf165f9d517a9e218ef3ec5635138c",
-                    "mixHash" : "0xf3923d3cc0c82ef5d77cdb6b79281d3a530639942afafcb44f4c5961365f6d07",
-                    "nonce" : "0xf76b12ac92ad7bee",
+                    "hash" : "0xba94262a5d9795bfcdbf08e58bf39e4ae55fb56cc28fb6dd088fabf742d83033",
+                    "mixHash" : "0x6186d9887703dbdf284c4965a9c0989bb7f3a0564c2ea0df54ae6d3bb8139930",
+                    "nonce" : "0x8f5d31d076ddc1f2",
                     "number" : "0x01",
                     "parentHash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
-                    "receiptTrie" : "0xce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453",
-                    "stateRoot" : "0xe22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0",
+                    "receiptTrie" : "0x68ba6c6060bce18ea95d3920206a7c51d56e77984aa2781561aa207249d4dd9e",
+                    "stateRoot" : "0x8d5e6b8eb0586260e1fbed6dd517781ffc44c852d3e0352811551b0d10e1662a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0a08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a0ce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a0f3923d3cc0c82ef5d77cdb6b79281d3a530639942afafcb44f4c5961365f6d0788f76b12ac92ad7beef882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
+                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d5e6b8eb0586260e1fbed6dd517781ffc44c852d3e0352811551b0d10e1662aa08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a068ba6c6060bce18ea95d3920206a7c51d56e77984aa2781561aa207249d4dd9eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a06186d9887703dbdf284c4965a9c0989bb7f3a0564c2ea0df54ae6d3bb8139930888f5d31d076ddc1f2f882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x599ff68fa3e77cea83f376866c97fc90ebbf165f9d517a9e218ef3ec5635138c",
-        "network" : "EIP150",
+        "lastblockhash" : "0xba94262a5d9795bfcdbf08e58bf39e4ae55fb56cc28fb6dd088fabf742d83033",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x6000600060006000600060003561ea60f1600a55",
@@ -132,10 +139,10 @@
             }
         }
     },
-    "RevertOpcodeDirectCall_d0g1v0_EIP158" : {
+    "RevertOpcodeDirectCall_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeDirectCall_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -147,18 +154,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0109a0",
-                    "hash" : "0x773a961ac3bcc16beafe5966aa4773f166464c2f9d117468758fdd9f4b42bf4c",
-                    "mixHash" : "0x8dc50e7b9cea205b84a6c9e37feec96202ccf9e735bddc8ceadfaa60fa2f2af1",
-                    "nonce" : "0x2e84647793c3a44f",
+                    "hash" : "0x179d97471c009e093e5f9cfcbe8472c7afc6aaa10234856448af3527c8030dfd",
+                    "mixHash" : "0x0f578c43a68d97242e9f102d9920523dac7dcf9f4f56cef0b01ea16e1bedd955",
+                    "nonce" : "0x60aa9a5fa0bb52c5",
                     "number" : "0x01",
                     "parentHash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
-                    "receiptTrie" : "0xce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453",
-                    "stateRoot" : "0xe22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0",
+                    "receiptTrie" : "0x68ba6c6060bce18ea95d3920206a7c51d56e77984aa2781561aa207249d4dd9e",
+                    "stateRoot" : "0x8d5e6b8eb0586260e1fbed6dd517781ffc44c852d3e0352811551b0d10e1662a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0a08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a0ce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a08dc50e7b9cea205b84a6c9e37feec96202ccf9e735bddc8ceadfaa60fa2f2af1882e84647793c3a44ff882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
+                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d5e6b8eb0586260e1fbed6dd517781ffc44c852d3e0352811551b0d10e1662aa08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a068ba6c6060bce18ea95d3920206a7c51d56e77984aa2781561aa207249d4dd9eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a00f578c43a68d97242e9f102d9920523dac7dcf9f4f56cef0b01ea16e1bedd9558860aa9a5fa0bb52c5f882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -195,9 +202,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x773a961ac3bcc16beafe5966aa4773f166464c2f9d117468758fdd9f4b42bf4c",
-        "network" : "EIP158",
+        "lastblockhash" : "0x179d97471c009e093e5f9cfcbe8472c7afc6aaa10234856448af3527c8030dfd",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x6000600060006000600060003561ea60f1600a55",
@@ -265,10 +279,10 @@
             }
         }
     },
-    "RevertOpcodeDirectCall_d0g1v0_Frontier" : {
+    "RevertOpcodeDirectCall_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeDirectCall_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -280,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0109a0",
-                    "hash" : "0x7d278da6e12a5dbd2212f676f87a174f63a4a1a866f1893cd5ce9d0b055545aa",
-                    "mixHash" : "0x7cf12adcc70adb37e65f522d838d7d750848abfca4398b959f2334e113b474ed",
-                    "nonce" : "0x5328ec326bf9f456",
+                    "hash" : "0xd5b5bd549c8494facae7155c5fcba6486db2a7632bf9fcbe9d83072f7a60a0cf",
+                    "mixHash" : "0x58e5e9bdf04f013ac2e00c62599ee79214c255634decd89c1e15a3be6415ce43",
+                    "nonce" : "0x026ae09b4063d0ba",
                     "number" : "0x01",
                     "parentHash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
                     "receiptTrie" : "0xce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453",
@@ -291,7 +305,7 @@
                     "transactionsTrie" : "0x8f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0a08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a0ce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a07cf12adcc70adb37e65f522d838d7d750848abfca4398b959f2334e113b474ed885328ec326bf9f456f882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
+                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0a08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a0ce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a058e5e9bdf04f013ac2e00c62599ee79214c255634decd89c1e15a3be6415ce4388026ae09b4063d0baf882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -328,8 +342,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7d278da6e12a5dbd2212f676f87a174f63a4a1a866f1893cd5ce9d0b055545aa",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd5b5bd549c8494facae7155c5fcba6486db2a7632bf9fcbe9d83072f7a60a0cf",
+        "network" : "EIP150",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -398,10 +412,10 @@
             }
         }
     },
-    "RevertOpcodeDirectCall_d0g1v0_Homestead" : {
+    "RevertOpcodeDirectCall_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeDirectCall_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -413,9 +427,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0109a0",
-                    "hash" : "0x3d6d2f45cefdcd801862174e7f2389c468e199c0f43dd7ef64b038dc6608426b",
-                    "mixHash" : "0x128c1b3a9a92b22442a5918a22db5e582f1324b000b7b4b41ed21f88a1968885",
-                    "nonce" : "0x93defd8ab8c72ad6",
+                    "hash" : "0x65380ffdcf822eb8fcbcf504f8e13dc184b6fa23386dd3f4ea6e184d63a3f038",
+                    "mixHash" : "0x2346b9dca209de8a40c8092842b29f690279f60b096ae56696c2940a713e5934",
+                    "nonce" : "0xf30877c4b8c47e68",
                     "number" : "0x01",
                     "parentHash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
                     "receiptTrie" : "0xce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453",
@@ -424,7 +438,7 @@
                     "transactionsTrie" : "0x8f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0a08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a0ce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a0128c1b3a9a92b22442a5918a22db5e582f1324b000b7b4b41ed21f88a19688858893defd8ab8c72ad6f882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
+                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0a08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a0ce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a02346b9dca209de8a40c8092842b29f690279f60b096ae56696c2940a713e593488f30877c4b8c47e68f882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -461,8 +475,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3d6d2f45cefdcd801862174e7f2389c468e199c0f43dd7ef64b038dc6608426b",
-        "network" : "Homestead",
+        "lastblockhash" : "0x65380ffdcf822eb8fcbcf504f8e13dc184b6fa23386dd3f4ea6e184d63a3f038",
+        "network" : "EIP158",
         "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
@@ -531,10 +545,10 @@
             }
         }
     },
-    "RevertOpcodeDirectCall_d0g1v0_Metropolis" : {
+    "RevertOpcodeDirectCall_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeDirectCall_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -546,18 +560,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0109a0",
-                    "hash" : "0x615ac63cde059cdca9cc59abc574aaa93862be3f04c25145442d2dfe42d0c393",
-                    "mixHash" : "0x09f34c5e10e119823b4bf669117b8fa2a25d70f596184ec6830e01dc991da2cb",
-                    "nonce" : "0x067d0f82b94357ef",
+                    "hash" : "0xd8be0bca98c6d28906020699ce7addf038459848715a1bfb17ecdb6f35e2c416",
+                    "mixHash" : "0xd4e69c7c99be57ccfc2bce632f8705dfa84024016ed8711d5ab2d3c2ad5af474",
+                    "nonce" : "0x6b4be2c79183494a",
                     "number" : "0x01",
                     "parentHash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
-                    "receiptTrie" : "0x68ba6c6060bce18ea95d3920206a7c51d56e77984aa2781561aa207249d4dd9e",
-                    "stateRoot" : "0x8d5e6b8eb0586260e1fbed6dd517781ffc44c852d3e0352811551b0d10e1662a",
+                    "receiptTrie" : "0xce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453",
+                    "stateRoot" : "0xe22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d5e6b8eb0586260e1fbed6dd517781ffc44c852d3e0352811551b0d10e1662aa08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a068ba6c6060bce18ea95d3920206a7c51d56e77984aa2781561aa207249d4dd9eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a009f34c5e10e119823b4bf669117b8fa2a25d70f596184ec6830e01dc991da2cb88067d0f82b94357eff882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
+                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0a08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a0ce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a0d4e69c7c99be57ccfc2bce632f8705dfa84024016ed8711d5ab2d3c2ad5af474886b4be2c79183494af882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
@@ -594,16 +608,142 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x615ac63cde059cdca9cc59abc574aaa93862be3f04c25145442d2dfe42d0c393",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd8be0bca98c6d28906020699ce7addf038459848715a1bfb17ecdb6f35e2c416",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600060003561ea60f1600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f509a0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a40660",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600060003561ea60f1600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61c350f1600055600e600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeDirectCall_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeDirectCall_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0109a0",
+                    "hash" : "0x2b0c2764641aaf7fe450472422be4577b040685a1ebc96a841edbd904ea81241",
+                    "mixHash" : "0x05c272983f4142b3ccf48156b0842326a6adae6f03816f0d42322bff24bb5990",
+                    "nonce" : "0x3bb8baa79d67f077",
+                    "number" : "0x01",
+                    "parentHash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
+                    "receiptTrie" : "0xce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453",
+                    "stateRoot" : "0xe22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a05110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e22dd241bf3c2965fefa0262f35069507d5c0d4b8ec34965724946aa02425fe0a08f24e0c5dc86996e9ed5034cca996ceb7b6044fbb1effbc59bb00aad9788a521a0ce7464a4e930b54a907eb7cefa724ca6e6aee84ba1e6d9f2bdc0aa69cee22453b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830109a08203e880a005c272983f4142b3ccf48156b0842326a6adae6f03816f0d42322bff24bb5990883bb8baa79d67f077f882f8808001830109a094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80a0000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b1ca061d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8a02f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "gasLimit" : "0x0109a0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x61d2fa757acaa2f6adf2f80ab8796847ed36ab3cd5832d570ba58887ef3203e8",
+                        "s" : "0x2f36e284cdc7a7dce6cef630c9dacaac36b041ad4ef7f5c693de4593ae9c286a",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x5110fa8a226d852c87d3288ac175594c94ed2f3c644a948e00472e1d2029cff9",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xdacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dacb7a7fae969fe113ff8a3d15555da1958e7ac1cdc7211b3acdb5fad79d9bf4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2b0c2764641aaf7fe450472422be4577b040685a1ebc96a841edbd904ea81241",
+        "network" : "Homestead",
+        "postState" : {
             "0x094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
                 "code" : "0x6000600060006000600060003561ea60f1600a55",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeInCreateReturns_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeInCreateReturns_d0g0v0.json
index 394b7e031..83c79d92a 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeInCreateReturns_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeInCreateReturns_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeInCreateReturns_d0g0v0_EIP150" : {
+    "RevertOpcodeInCreateReturns_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/stRevertTest/RevertOpcodeInCreateReturns_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
-                    "gasUsed" : "0x0a00000000",
-                    "hash" : "0x3a921dde420364cbdb68ffb5501406c85c4825f4198466ece0b3c72a8fac43c0",
-                    "mixHash" : "0xd1e24ad504e7a9ddde97c4145206ee9a991c3559a1c211ab0a42a1182f571cc7",
-                    "nonce" : "0x8ceddebc0c64bece",
+                    "gasUsed" : "0xe2c4",
+                    "hash" : "0x5a8b79cadcaa9ba8de3a5bf1622bdaba985c7432be4fa0b9fd5992983ce813f1",
+                    "mixHash" : "0xfd43356afd649a8565348f935770f14d756794c5814a7d08709b1a5f3569cba1",
+                    "nonce" : "0x2827403570b9bfca",
                     "number" : "0x01",
                     "parentHash" : "0x09f23a241389efa5980da600e48d341902820f790eceab5c903a7142eebd72bd",
-                    "receiptTrie" : "0x580e2d3efc531eb6f02c5b2ff55af3947ce271f4b4d5fa333e07017b62839642",
-                    "stateRoot" : "0x62205f2c07724708535b9c6346a799738efff3da546ba662dbfbec8d345095b5",
+                    "receiptTrie" : "0xed8da5208973466d571a15b6d4519bc930576ddfc04ab255af5551af05b1cd71",
+                    "stateRoot" : "0xffab66f57e0022d4f1a33c2969171d264cead8366bd536f6a106a135cc7589a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xde317ba0085ad3bc6f64da920500c40ceb94789c007f8c54b3e766eae29616ab",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca009f23a241389efa5980da600e48d341902820f790eceab5c903a7142eebd72bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062205f2c07724708535b9c6346a799738efff3da546ba662dbfbec8d345095b5a0de317ba0085ad3bc6f64da920500c40ceb94789c007f8c54b3e766eae29616aba0580e2d3efc531eb6f02c5b2ff55af3947ce271f4b4d5fa333e07017b62839642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0d1e24ad504e7a9ddde97c4145206ee9a991c3559a1c211ab0a42a1182f571cc7888ceddebc0c64becef864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec680801ba03b6c2d4d0d9d0abf4d624a6f2930e213789e9c00f679a9afa996fb4bd27cb507a024a40d7f4cf44278ac739ecf9eeba61554646709142d968ed1c555be138a3ea2c0",
+                "rlp" : "0xf90263f901f9a009f23a241389efa5980da600e48d341902820f790eceab5c903a7142eebd72bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffab66f57e0022d4f1a33c2969171d264cead8366bd536f6a106a135cc7589a8a0de317ba0085ad3bc6f64da920500c40ceb94789c007f8c54b3e766eae29616aba0ed8da5208973466d571a15b6d4519bc930576ddfc04ab255af5551af05b1cd71b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082e2c48203e880a0fd43356afd649a8565348f935770f14d756794c5814a7d08709b1a5f3569cba1882827403570b9bfcaf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec680801ba03b6c2d4d0d9d0abf4d624a6f2930e213789e9c00f679a9afa996fb4bd27cb507a024a40d7f4cf44278ac739ecf9eeba61554646709142d968ed1c555be138a3ea2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,40 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab3b7f96ad4dabdd50a53dd23d8c13f2e42233fe4c5d79509c61fe64ab0e55e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3a921dde420364cbdb68ffb5501406c85c4825f4198466ece0b3c72a8fac43c0",
-        "network" : "EIP150",
+        "lastblockhash" : "0x5a8b79cadcaa9ba8de3a5bf1622bdaba985c7432be4fa0b9fd5992983ce813f1",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x00",
+                "code" : "0x600c80601360003960006000f0503d600055006211223360005260206000fd",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x20"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4e2c4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x63ffff1d3c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x00",
                 "code" : "0x600c80601360003960006000f0503d600055006211223360005260206000fd",
@@ -73,15 +104,105 @@
                     "0x00" : "0x01"
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeInCreateReturns_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeInCreateReturns_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0a00000000",
+                    "gasUsed" : "0xe2c4",
+                    "hash" : "0x1869b9c23e6bf619723feecc65da4db5bd0f910242ad235af4532fe43262ac7c",
+                    "mixHash" : "0x8862fc35aa35f349258898dcfd7a399b63da758a2f49f523d5d8ab6569bc6888",
+                    "nonce" : "0x2fa88a7fe0937d67",
+                    "number" : "0x01",
+                    "parentHash" : "0x09f23a241389efa5980da600e48d341902820f790eceab5c903a7142eebd72bd",
+                    "receiptTrie" : "0xed8da5208973466d571a15b6d4519bc930576ddfc04ab255af5551af05b1cd71",
+                    "stateRoot" : "0xffab66f57e0022d4f1a33c2969171d264cead8366bd536f6a106a135cc7589a8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xde317ba0085ad3bc6f64da920500c40ceb94789c007f8c54b3e766eae29616ab",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f9a009f23a241389efa5980da600e48d341902820f790eceab5c903a7142eebd72bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffab66f57e0022d4f1a33c2969171d264cead8366bd536f6a106a135cc7589a8a0de317ba0085ad3bc6f64da920500c40ceb94789c007f8c54b3e766eae29616aba0ed8da5208973466d571a15b6d4519bc930576ddfc04ab255af5551af05b1cd71b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082e2c48203e880a08862fc35aa35f349258898dcfd7a399b63da758a2f49f523d5d8ab6569bc6888882fa88a7fe0937d67f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec680801ba03b6c2d4d0d9d0abf4d624a6f2930e213789e9c00f679a9afa996fb4bd27cb507a024a40d7f4cf44278ac739ecf9eeba61554646709142d968ed1c555be138a3ea2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0a00000000",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b6c2d4d0d9d0abf4d624a6f2930e213789e9c00f679a9afa996fb4bd27cb507",
+                        "s" : "0x24a40d7f4cf44278ac739ecf9eeba61554646709142d968ed1c555be138a3ea2",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0x00",
+            "hash" : "0x09f23a241389efa5980da600e48d341902820f790eceab5c903a7142eebd72bd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xab3b7f96ad4dabdd50a53dd23d8c13f2e42233fe4c5d79509c61fe64ab0e55e7",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab3b7f96ad4dabdd50a53dd23d8c13f2e42233fe4c5d79509c61fe64ab0e55e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1869b9c23e6bf619723feecc65da4db5bd0f910242ad235af4532fe43262ac7c",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x00",
+                "code" : "0x600c80601360003960006000f0503d600055006211223360005260206000fd",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x20"
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918c44f40000",
+                "balance" : "0x4563918244f4e2c4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x5a00000000",
+                "balance" : "0x63ffff1d3c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -106,10 +227,10 @@
             }
         }
     },
-    "RevertOpcodeInCreateReturns_d0g0v0_EIP158" : {
+    "RevertOpcodeInCreateReturns_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/stRevertTest/RevertOpcodeInCreateReturns_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0xfc34b180343d6b94e63a68d3a8d9d170e09fa6f720f5e1b861ce789e04e98e38",
-                    "mixHash" : "0x5fa37e599c5f0de60056dce177299ad6a3dcb314f8035d28ef7a589b8c201ab4",
-                    "nonce" : "0x5491bdcb560be050",
+                    "hash" : "0xafde0fa89f7c0d11ccba491c17ee6fbf85bcaa47f9b296bf6a54bfec5eff3677",
+                    "mixHash" : "0xb7ae4871bd030dd4a3ed98994fe2662e9989a1296f41e712df2bf94cdce27b4f",
+                    "nonce" : "0xcee6aaae69ee27f9",
                     "number" : "0x01",
                     "parentHash" : "0x09f23a241389efa5980da600e48d341902820f790eceab5c903a7142eebd72bd",
                     "receiptTrie" : "0x580e2d3efc531eb6f02c5b2ff55af3947ce271f4b4d5fa333e07017b62839642",
@@ -132,7 +253,7 @@
                     "transactionsTrie" : "0xde317ba0085ad3bc6f64da920500c40ceb94789c007f8c54b3e766eae29616ab",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca009f23a241389efa5980da600e48d341902820f790eceab5c903a7142eebd72bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062205f2c07724708535b9c6346a799738efff3da546ba662dbfbec8d345095b5a0de317ba0085ad3bc6f64da920500c40ceb94789c007f8c54b3e766eae29616aba0580e2d3efc531eb6f02c5b2ff55af3947ce271f4b4d5fa333e07017b62839642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a05fa37e599c5f0de60056dce177299ad6a3dcb314f8035d28ef7a589b8c201ab4885491bdcb560be050f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec680801ba03b6c2d4d0d9d0abf4d624a6f2930e213789e9c00f679a9afa996fb4bd27cb507a024a40d7f4cf44278ac739ecf9eeba61554646709142d968ed1c555be138a3ea2c0",
+                "rlp" : "0xf90266f901fca009f23a241389efa5980da600e48d341902820f790eceab5c903a7142eebd72bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062205f2c07724708535b9c6346a799738efff3da546ba662dbfbec8d345095b5a0de317ba0085ad3bc6f64da920500c40ceb94789c007f8c54b3e766eae29616aba0580e2d3efc531eb6f02c5b2ff55af3947ce271f4b4d5fa333e07017b62839642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0b7ae4871bd030dd4a3ed98994fe2662e9989a1296f41e712df2bf94cdce27b4f88cee6aaae69ee27f9f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec680801ba03b6c2d4d0d9d0abf4d624a6f2930e213789e9c00f679a9afa996fb4bd27cb507a024a40d7f4cf44278ac739ecf9eeba61554646709142d968ed1c555be138a3ea2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab3b7f96ad4dabdd50a53dd23d8c13f2e42233fe4c5d79509c61fe64ab0e55e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfc34b180343d6b94e63a68d3a8d9d170e09fa6f720f5e1b861ce789e04e98e38",
-        "network" : "EIP158",
+        "lastblockhash" : "0xafde0fa89f7c0d11ccba491c17ee6fbf85bcaa47f9b296bf6a54bfec5eff3677",
+        "network" : "EIP150",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x00",
@@ -213,10 +334,10 @@
             }
         }
     },
-    "RevertOpcodeInCreateReturns_d0g0v0_Frontier" : {
+    "RevertOpcodeInCreateReturns_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/stRevertTest/RevertOpcodeInCreateReturns_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0x9637826c6a9866dc5484b7ff16c576cc5b7a395126059cd9f4509e290ce536fe",
-                    "mixHash" : "0x51bdccb71cfe4d1ccd4975e7cddce50bd3514755401e52eb71258f08c8515b0e",
-                    "nonce" : "0x32d151c335bf3361",
+                    "hash" : "0x4a9f04642b4799be561e196cc0770035d7a02edb90d641f2a0eae0301ff7d6c6",
+                    "mixHash" : "0x01674c7bdeda8ce5d0bb605eab6feb55ef1a9db3fd975bbf339564ec493e21c4",
+                    "nonce" : "0xc17e158c38a70851",
                     "number" : "0x01",
                     "parentHash" : "0x09f23a241389efa5980da600e48d341902820f790eceab5c903a7142eebd72bd",
                     "receiptTrie" : "0x580e2d3efc531eb6f02c5b2ff55af3947ce271f4b4d5fa333e07017b62839642",
@@ -239,7 +360,7 @@
                     "transactionsTrie" : "0xde317ba0085ad3bc6f64da920500c40ceb94789c007f8c54b3e766eae29616ab",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca009f23a241389efa5980da600e48d341902820f790eceab5c903a7142eebd72bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062205f2c07724708535b9c6346a799738efff3da546ba662dbfbec8d345095b5a0de317ba0085ad3bc6f64da920500c40ceb94789c007f8c54b3e766eae29616aba0580e2d3efc531eb6f02c5b2ff55af3947ce271f4b4d5fa333e07017b62839642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a051bdccb71cfe4d1ccd4975e7cddce50bd3514755401e52eb71258f08c8515b0e8832d151c335bf3361f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec680801ba03b6c2d4d0d9d0abf4d624a6f2930e213789e9c00f679a9afa996fb4bd27cb507a024a40d7f4cf44278ac739ecf9eeba61554646709142d968ed1c555be138a3ea2c0",
+                "rlp" : "0xf90266f901fca009f23a241389efa5980da600e48d341902820f790eceab5c903a7142eebd72bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062205f2c07724708535b9c6346a799738efff3da546ba662dbfbec8d345095b5a0de317ba0085ad3bc6f64da920500c40ceb94789c007f8c54b3e766eae29616aba0580e2d3efc531eb6f02c5b2ff55af3947ce271f4b4d5fa333e07017b62839642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a001674c7bdeda8ce5d0bb605eab6feb55ef1a9db3fd975bbf339564ec493e21c488c17e158c38a70851f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec680801ba03b6c2d4d0d9d0abf4d624a6f2930e213789e9c00f679a9afa996fb4bd27cb507a024a40d7f4cf44278ac739ecf9eeba61554646709142d968ed1c555be138a3ea2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab3b7f96ad4dabdd50a53dd23d8c13f2e42233fe4c5d79509c61fe64ab0e55e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9637826c6a9866dc5484b7ff16c576cc5b7a395126059cd9f4509e290ce536fe",
-        "network" : "Frontier",
+        "lastblockhash" : "0x4a9f04642b4799be561e196cc0770035d7a02edb90d641f2a0eae0301ff7d6c6",
+        "network" : "EIP158",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x00",
@@ -320,10 +441,10 @@
             }
         }
     },
-    "RevertOpcodeInCreateReturns_d0g0v0_Homestead" : {
+    "RevertOpcodeInCreateReturns_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/stRevertTest/RevertOpcodeInCreateReturns_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
                     "gasUsed" : "0x0a00000000",
-                    "hash" : "0xa5cf250e07866f5aaa070161fe5e43f4654cb50be78ec1750a6618ea93d1ca46",
-                    "mixHash" : "0x12b7dbed2d2c57afdaffe1ef73776c3677f4c26dc1217dc9e380279dd1697bf9",
-                    "nonce" : "0x61e5abd37ec0fefb",
+                    "hash" : "0xb417fa2c8dd4a370a03291a9394cf8e5371ad6e4abaa52de1f553d135665e691",
+                    "mixHash" : "0x83dfbcc1ecca6050f536c49d668d62f6bae71cd29c8ddd276a5cf25eb4505f3b",
+                    "nonce" : "0x07cc2df9e408d893",
                     "number" : "0x01",
                     "parentHash" : "0x09f23a241389efa5980da600e48d341902820f790eceab5c903a7142eebd72bd",
                     "receiptTrie" : "0x580e2d3efc531eb6f02c5b2ff55af3947ce271f4b4d5fa333e07017b62839642",
@@ -346,7 +467,7 @@
                     "transactionsTrie" : "0xde317ba0085ad3bc6f64da920500c40ceb94789c007f8c54b3e766eae29616ab",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901fca009f23a241389efa5980da600e48d341902820f790eceab5c903a7142eebd72bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062205f2c07724708535b9c6346a799738efff3da546ba662dbfbec8d345095b5a0de317ba0085ad3bc6f64da920500c40ceb94789c007f8c54b3e766eae29616aba0580e2d3efc531eb6f02c5b2ff55af3947ce271f4b4d5fa333e07017b62839642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a012b7dbed2d2c57afdaffe1ef73776c3677f4c26dc1217dc9e380279dd1697bf98861e5abd37ec0fefbf864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec680801ba03b6c2d4d0d9d0abf4d624a6f2930e213789e9c00f679a9afa996fb4bd27cb507a024a40d7f4cf44278ac739ecf9eeba61554646709142d968ed1c555be138a3ea2c0",
+                "rlp" : "0xf90266f901fca009f23a241389efa5980da600e48d341902820f790eceab5c903a7142eebd72bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062205f2c07724708535b9c6346a799738efff3da546ba662dbfbec8d345095b5a0de317ba0085ad3bc6f64da920500c40ceb94789c007f8c54b3e766eae29616aba0580e2d3efc531eb6f02c5b2ff55af3947ce271f4b4d5fa333e07017b62839642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a083dfbcc1ecca6050f536c49d668d62f6bae71cd29c8ddd276a5cf25eb4505f3b8807cc2df9e408d893f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec680801ba03b6c2d4d0d9d0abf4d624a6f2930e213789e9c00f679a9afa996fb4bd27cb507a024a40d7f4cf44278ac739ecf9eeba61554646709142d968ed1c555be138a3ea2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +504,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab3b7f96ad4dabdd50a53dd23d8c13f2e42233fe4c5d79509c61fe64ab0e55e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa5cf250e07866f5aaa070161fe5e43f4654cb50be78ec1750a6618ea93d1ca46",
-        "network" : "Homestead",
+        "lastblockhash" : "0xb417fa2c8dd4a370a03291a9394cf8e5371ad6e4abaa52de1f553d135665e691",
+        "network" : "Frontier",
         "postState" : {
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x00",
@@ -427,10 +548,10 @@
             }
         }
     },
-    "RevertOpcodeInCreateReturns_d0g0v0_Metropolis" : {
+    "RevertOpcodeInCreateReturns_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeInCreateReturns_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +562,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0a00000000",
-                    "gasUsed" : "0xe2c4",
-                    "hash" : "0x785cef5a053a9681ce23565b1094b0abca31e216547db6445da5d136e078731f",
-                    "mixHash" : "0x5c0b506e553b9b6f9c615ce403b7f5ac7249a98dee0f971382266d12c4c178bf",
-                    "nonce" : "0xc4a4a345567fb3e4",
+                    "gasUsed" : "0x0a00000000",
+                    "hash" : "0xb1b17786cd9b036cef0ab340f804e304aea9f8f08121da266b236025325c06ea",
+                    "mixHash" : "0x5b67c201e75ffd1b6808bc537e45734d9ecd09d694d91e126c83a22f1dbaaf1c",
+                    "nonce" : "0xf28dcf8e63a80e19",
                     "number" : "0x01",
                     "parentHash" : "0x09f23a241389efa5980da600e48d341902820f790eceab5c903a7142eebd72bd",
-                    "receiptTrie" : "0xed8da5208973466d571a15b6d4519bc930576ddfc04ab255af5551af05b1cd71",
-                    "stateRoot" : "0xffab66f57e0022d4f1a33c2969171d264cead8366bd536f6a106a135cc7589a8",
+                    "receiptTrie" : "0x580e2d3efc531eb6f02c5b2ff55af3947ce271f4b4d5fa333e07017b62839642",
+                    "stateRoot" : "0x62205f2c07724708535b9c6346a799738efff3da546ba662dbfbec8d345095b5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xde317ba0085ad3bc6f64da920500c40ceb94789c007f8c54b3e766eae29616ab",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f9a009f23a241389efa5980da600e48d341902820f790eceab5c903a7142eebd72bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffab66f57e0022d4f1a33c2969171d264cead8366bd536f6a106a135cc7589a8a0de317ba0085ad3bc6f64da920500c40ceb94789c007f8c54b3e766eae29616aba0ed8da5208973466d571a15b6d4519bc930576ddfc04ab255af5551af05b1cd71b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a0000000082e2c48203e880a05c0b506e553b9b6f9c615ce403b7f5ac7249a98dee0f971382266d12c4c178bf88c4a4a345567fb3e4f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec680801ba03b6c2d4d0d9d0abf4d624a6f2930e213789e9c00f679a9afa996fb4bd27cb507a024a40d7f4cf44278ac739ecf9eeba61554646709142d968ed1c555be138a3ea2c0",
+                "rlp" : "0xf90266f901fca009f23a241389efa5980da600e48d341902820f790eceab5c903a7142eebd72bda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062205f2c07724708535b9c6346a799738efff3da546ba662dbfbec8d345095b5a0de317ba0085ad3bc6f64da920500c40ceb94789c007f8c54b3e766eae29616aba0580e2d3efc531eb6f02c5b2ff55af3947ce271f4b4d5fa333e07017b62839642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a05b67c201e75ffd1b6808bc537e45734d9ecd09d694d91e126c83a22f1dbaaf1c88f28dcf8e63a80e19f864f8628001850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec680801ba03b6c2d4d0d9d0abf4d624a6f2930e213789e9c00f679a9afa996fb4bd27cb507a024a40d7f4cf44278ac739ecf9eeba61554646709142d968ed1c555be138a3ea2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,33 +611,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab3b7f96ad4dabdd50a53dd23d8c13f2e42233fe4c5d79509c61fe64ab0e55e7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x785cef5a053a9681ce23565b1094b0abca31e216547db6445da5d136e078731f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb1b17786cd9b036cef0ab340f804e304aea9f8f08121da266b236025325c06ea",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "0x00",
                 "code" : "0x600c80601360003960006000f0503d600055006211223360005260206000fd",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x20"
+                    "0x00" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4e2c4",
+                "balance" : "0x4563918c44f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x63ffff1d3c",
+                "balance" : "0x5a00000000",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeInInit_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeInInit_d0g0v0.json
index 347c19064..f7892ee74 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeInInit_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeInInit_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeInInit_d0g0v0_EIP150" : {
+    "RevertOpcodeInInit_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/stRevertTest/RevertOpcodeInInit_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x027100",
-                    "hash" : "0x4faa16bffb36236126a788bc372a95d1530a3fe87bfdc8cf27dfd53e74948da9",
-                    "mixHash" : "0x23231386dacd4cab0af6982e0f6aaaf91340fc6b933c563b8005cd552260ba29",
-                    "nonce" : "0x670288edca2382da",
+                    "gasUsed" : "0x0120b3",
+                    "hash" : "0x8a7eba9e7633acf34d9408280035f5767eff00bc91d323022968742df23d1107",
+                    "mixHash" : "0x89120b5792c143fdff67043d9ee1625bcd3509ef7d0a5805f58c700990c989c3",
+                    "nonce" : "0x14b20176e8258950",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-                    "receiptTrie" : "0x46d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003",
-                    "stateRoot" : "0xff3084198410d872dedc1e4039cbea58fa883a5ca9a28700d2857b3f2711d9c9",
+                    "receiptTrie" : "0x055639b53c7883180bc32e4abeabb9e350ca2ee46a3c0801c95078756ce711ab",
+                    "stateRoot" : "0xee7b95ee875782592b2d19231a43b134d53b4432366181bcbd48270b59234966",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb2eef9690e462c29f66d10549ba21289953ce2a4fb4a82fb26daa404bb5ffe0f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025bf901f8a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff3084198410d872dedc1e4039cbea58fa883a5ca9a28700d2857b3f2711d9c9a0b2eef9690e462c29f66d10549ba21289953ce2a4fb4a82fb26daa404bb5ffe0fa046d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a023231386dacd4cab0af6982e0f6aaaf91340fc6b933c563b8005cd552260ba2988670288edca2382daf85df85b80018302710080808f600160005560016000fd60116001551ca0884ea2df20e652e208d0b88719de17a2ac32b45028efe40fc98f12238b846ea0a00de33f06e5928b416a227cc1e6c272c3fe193d27af85bb619164a724ab380194c0",
+                "rlp" : "0xf9025bf901f8a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee7b95ee875782592b2d19231a43b134d53b4432366181bcbd48270b59234966a0b2eef9690e462c29f66d10549ba21289953ce2a4fb4a82fb26daa404bb5ffe0fa0055639b53c7883180bc32e4abeabb9e350ca2ee46a3c0801c95078756ce711abb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830120b38203e880a089120b5792c143fdff67043d9ee1625bcd3509ef7d0a5805f58c700990c989c38814b20176e8258950f85df85b80018302710080808f600160005560016000fd60116001551ca0884ea2df20e652e208d0b88719de17a2ac32b45028efe40fc98f12238b846ea0a00de33f06e5928b416a227cc1e6c272c3fe193d27af85bb619164a724ab380194c0",
                 "transactions" : [
                     {
                         "data" : "0x600160005560016000fd6011600155",
@@ -62,18 +62,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4faa16bffb36236126a788bc372a95d1530a3fe87bfdc8cf27dfd53e74948da9",
-        "network" : "EIP150",
+        "lastblockhash" : "0x8a7eba9e7633acf34d9408280035f5767eff00bc91d323022968742df23d1107",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f67100",
+                "balance" : "0x4563918244f520b3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a29f00",
+                "balance" : "0xe8d4a3ef4d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -90,10 +97,10 @@
             }
         }
     },
-    "RevertOpcodeInInit_d0g0v0_EIP158" : {
+    "RevertOpcodeInInit_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/stRevertTest/RevertOpcodeInInit_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -104,19 +111,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x027100",
-                    "hash" : "0x6c447d02167776eda0567219458e535e0c5e1318c24be36b1912961a188d6481",
-                    "mixHash" : "0x5f0fc30a94a3e5c62678621dc6a2a28467b54f58655aae6af469983e8c8d29e6",
-                    "nonce" : "0xbdfeeab2149a7996",
+                    "gasUsed" : "0x0120b3",
+                    "hash" : "0xc34348b3e5bc14fe1d2657bcecb940c2171acbff2c1e58eb7fce228c0b4d40b7",
+                    "mixHash" : "0x862efc75d93c3fefe30cbb0b42c4d47d5bb5fe13447b367f868540192ea6d4a6",
+                    "nonce" : "0xff0316d1495ba84f",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-                    "receiptTrie" : "0x46d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003",
-                    "stateRoot" : "0xff3084198410d872dedc1e4039cbea58fa883a5ca9a28700d2857b3f2711d9c9",
+                    "receiptTrie" : "0x055639b53c7883180bc32e4abeabb9e350ca2ee46a3c0801c95078756ce711ab",
+                    "stateRoot" : "0xee7b95ee875782592b2d19231a43b134d53b4432366181bcbd48270b59234966",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb2eef9690e462c29f66d10549ba21289953ce2a4fb4a82fb26daa404bb5ffe0f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025bf901f8a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff3084198410d872dedc1e4039cbea58fa883a5ca9a28700d2857b3f2711d9c9a0b2eef9690e462c29f66d10549ba21289953ce2a4fb4a82fb26daa404bb5ffe0fa046d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a05f0fc30a94a3e5c62678621dc6a2a28467b54f58655aae6af469983e8c8d29e688bdfeeab2149a7996f85df85b80018302710080808f600160005560016000fd60116001551ca0884ea2df20e652e208d0b88719de17a2ac32b45028efe40fc98f12238b846ea0a00de33f06e5928b416a227cc1e6c272c3fe193d27af85bb619164a724ab380194c0",
+                "rlp" : "0xf9025bf901f8a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee7b95ee875782592b2d19231a43b134d53b4432366181bcbd48270b59234966a0b2eef9690e462c29f66d10549ba21289953ce2a4fb4a82fb26daa404bb5ffe0fa0055639b53c7883180bc32e4abeabb9e350ca2ee46a3c0801c95078756ce711abb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830120b38203e880a0862efc75d93c3fefe30cbb0b42c4d47d5bb5fe13447b367f868540192ea6d4a688ff0316d1495ba84ff85df85b80018302710080808f600160005560016000fd60116001551ca0884ea2df20e652e208d0b88719de17a2ac32b45028efe40fc98f12238b846ea0a00de33f06e5928b416a227cc1e6c272c3fe193d27af85bb619164a724ab380194c0",
                 "transactions" : [
                     {
                         "data" : "0x600160005560016000fd6011600155",
@@ -153,18 +160,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6c447d02167776eda0567219458e535e0c5e1318c24be36b1912961a188d6481",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc34348b3e5bc14fe1d2657bcecb940c2171acbff2c1e58eb7fce228c0b4d40b7",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f67100",
+                "balance" : "0x4563918244f520b3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a29f00",
+                "balance" : "0xe8d4a3ef4d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -181,10 +195,10 @@
             }
         }
     },
-    "RevertOpcodeInInit_d0g0v0_Frontier" : {
+    "RevertOpcodeInInit_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/stRevertTest/RevertOpcodeInInit_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -196,9 +210,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0x3b644a2bc42386fc49ddca9440097632870976cf6f4c953b8abcdcf978ee1183",
-                    "mixHash" : "0x0c8c11f0e053561b5a9fc6109acfc70f2555e2ed7d14f51b1ff31d474db043a2",
-                    "nonce" : "0x56a743ce8864c578",
+                    "hash" : "0xcd6f8ea24c6472187abf8cacdee70af81ba66424886af1eed7f853a097ad8801",
+                    "mixHash" : "0xd16ed407749e74522605a535d6c3699ed77aeb51240a5fcf82dcf67c460347dd",
+                    "nonce" : "0x560556167caf25a4",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
                     "receiptTrie" : "0x46d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003",
@@ -207,7 +221,7 @@
                     "transactionsTrie" : "0xb2eef9690e462c29f66d10549ba21289953ce2a4fb4a82fb26daa404bb5ffe0f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025bf901f8a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff3084198410d872dedc1e4039cbea58fa883a5ca9a28700d2857b3f2711d9c9a0b2eef9690e462c29f66d10549ba21289953ce2a4fb4a82fb26daa404bb5ffe0fa046d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a00c8c11f0e053561b5a9fc6109acfc70f2555e2ed7d14f51b1ff31d474db043a28856a743ce8864c578f85df85b80018302710080808f600160005560016000fd60116001551ca0884ea2df20e652e208d0b88719de17a2ac32b45028efe40fc98f12238b846ea0a00de33f06e5928b416a227cc1e6c272c3fe193d27af85bb619164a724ab380194c0",
+                "rlp" : "0xf9025bf901f8a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff3084198410d872dedc1e4039cbea58fa883a5ca9a28700d2857b3f2711d9c9a0b2eef9690e462c29f66d10549ba21289953ce2a4fb4a82fb26daa404bb5ffe0fa046d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0d16ed407749e74522605a535d6c3699ed77aeb51240a5fcf82dcf67c460347dd88560556167caf25a4f85df85b80018302710080808f600160005560016000fd60116001551ca0884ea2df20e652e208d0b88719de17a2ac32b45028efe40fc98f12238b846ea0a00de33f06e5928b416a227cc1e6c272c3fe193d27af85bb619164a724ab380194c0",
                 "transactions" : [
                     {
                         "data" : "0x600160005560016000fd6011600155",
@@ -244,8 +258,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3b644a2bc42386fc49ddca9440097632870976cf6f4c953b8abcdcf978ee1183",
-        "network" : "Frontier",
+        "lastblockhash" : "0xcd6f8ea24c6472187abf8cacdee70af81ba66424886af1eed7f853a097ad8801",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f67100",
@@ -272,10 +286,10 @@
             }
         }
     },
-    "RevertOpcodeInInit_d0g0v0_Homestead" : {
+    "RevertOpcodeInInit_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/stRevertTest/RevertOpcodeInInit_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -287,9 +301,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0xf119eb4f63266d86d9cf47a71c63040672b879dc7acc4f18a15dc9d4e60140cc",
-                    "mixHash" : "0x3c80b314c7d8b2eabc16b82fc6923a77e29ba9bee4f27da73c9ff6b029fa0f89",
-                    "nonce" : "0x64e2c665000a3480",
+                    "hash" : "0xeaa29fa3d3a570b3ab15e5ee15b005e0efb99c36bfb4ebff1990bd47c539f525",
+                    "mixHash" : "0x9053bdba0420a54f86ffe75aa3d4f56def262c214d77299f322ee6a2c176c125",
+                    "nonce" : "0x050f0a6e25203011",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
                     "receiptTrie" : "0x46d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003",
@@ -298,7 +312,7 @@
                     "transactionsTrie" : "0xb2eef9690e462c29f66d10549ba21289953ce2a4fb4a82fb26daa404bb5ffe0f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025bf901f8a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff3084198410d872dedc1e4039cbea58fa883a5ca9a28700d2857b3f2711d9c9a0b2eef9690e462c29f66d10549ba21289953ce2a4fb4a82fb26daa404bb5ffe0fa046d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a03c80b314c7d8b2eabc16b82fc6923a77e29ba9bee4f27da73c9ff6b029fa0f898864e2c665000a3480f85df85b80018302710080808f600160005560016000fd60116001551ca0884ea2df20e652e208d0b88719de17a2ac32b45028efe40fc98f12238b846ea0a00de33f06e5928b416a227cc1e6c272c3fe193d27af85bb619164a724ab380194c0",
+                "rlp" : "0xf9025bf901f8a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff3084198410d872dedc1e4039cbea58fa883a5ca9a28700d2857b3f2711d9c9a0b2eef9690e462c29f66d10549ba21289953ce2a4fb4a82fb26daa404bb5ffe0fa046d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a09053bdba0420a54f86ffe75aa3d4f56def262c214d77299f322ee6a2c176c12588050f0a6e25203011f85df85b80018302710080808f600160005560016000fd60116001551ca0884ea2df20e652e208d0b88719de17a2ac32b45028efe40fc98f12238b846ea0a00de33f06e5928b416a227cc1e6c272c3fe193d27af85bb619164a724ab380194c0",
                 "transactions" : [
                     {
                         "data" : "0x600160005560016000fd6011600155",
@@ -335,8 +349,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf119eb4f63266d86d9cf47a71c63040672b879dc7acc4f18a15dc9d4e60140cc",
-        "network" : "Homestead",
+        "lastblockhash" : "0xeaa29fa3d3a570b3ab15e5ee15b005e0efb99c36bfb4ebff1990bd47c539f525",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f67100",
@@ -363,10 +377,10 @@
             }
         }
     },
-    "RevertOpcodeInInit_d0g0v0_Metropolis" : {
+    "RevertOpcodeInInit_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/stRevertTest/RevertOpcodeInInit_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -377,19 +391,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0120b3",
-                    "hash" : "0x610f8757c9b423a83b19bba7ceb85eca29f8e80327ca7110aedf48ed95e80fc2",
-                    "mixHash" : "0x50cda3d38cfdd0d70e061afe56e35858644148ccf35a2bf304261982e462d4fe",
-                    "nonce" : "0x96d8a8106644a7c3",
+                    "gasUsed" : "0x027100",
+                    "hash" : "0x5e1922292af330b45e0e9deb513168046d57b52723bf73771a02e42970cb9f44",
+                    "mixHash" : "0x062642505675672bfbd8447eb36155cfb7395095829df19ceef1ed21e24b2b38",
+                    "nonce" : "0xb7fceb0598854957",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-                    "receiptTrie" : "0x055639b53c7883180bc32e4abeabb9e350ca2ee46a3c0801c95078756ce711ab",
-                    "stateRoot" : "0xee7b95ee875782592b2d19231a43b134d53b4432366181bcbd48270b59234966",
+                    "receiptTrie" : "0x46d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003",
+                    "stateRoot" : "0xff3084198410d872dedc1e4039cbea58fa883a5ca9a28700d2857b3f2711d9c9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb2eef9690e462c29f66d10549ba21289953ce2a4fb4a82fb26daa404bb5ffe0f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025bf901f8a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee7b95ee875782592b2d19231a43b134d53b4432366181bcbd48270b59234966a0b2eef9690e462c29f66d10549ba21289953ce2a4fb4a82fb26daa404bb5ffe0fa0055639b53c7883180bc32e4abeabb9e350ca2ee46a3c0801c95078756ce711abb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830120b38203e880a050cda3d38cfdd0d70e061afe56e35858644148ccf35a2bf304261982e462d4fe8896d8a8106644a7c3f85df85b80018302710080808f600160005560016000fd60116001551ca0884ea2df20e652e208d0b88719de17a2ac32b45028efe40fc98f12238b846ea0a00de33f06e5928b416a227cc1e6c272c3fe193d27af85bb619164a724ab380194c0",
+                "rlp" : "0xf9025bf901f8a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff3084198410d872dedc1e4039cbea58fa883a5ca9a28700d2857b3f2711d9c9a0b2eef9690e462c29f66d10549ba21289953ce2a4fb4a82fb26daa404bb5ffe0fa046d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0062642505675672bfbd8447eb36155cfb7395095829df19ceef1ed21e24b2b3888b7fceb0598854957f85df85b80018302710080808f600160005560016000fd60116001551ca0884ea2df20e652e208d0b88719de17a2ac32b45028efe40fc98f12238b846ea0a00de33f06e5928b416a227cc1e6c272c3fe193d27af85bb619164a724ab380194c0",
                 "transactions" : [
                     {
                         "data" : "0x600160005560016000fd6011600155",
@@ -426,25 +440,109 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x610f8757c9b423a83b19bba7ceb85eca29f8e80327ca7110aedf48ed95e80fc2",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x5e1922292af330b45e0e9deb513168046d57b52723bf73771a02e42970cb9f44",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f67100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a29f00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeInInit_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeInInit_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x027100",
+                    "hash" : "0xf91c14b1c753af0366df68f62ea3564f0a45500e77c07ba6a93f5875d6dac4fc",
+                    "mixHash" : "0xac6515d3efad831a7c15c9974bf852ed9124150a44acd2c9b09c93ee1f312f7d",
+                    "nonce" : "0x0d46e25dafa607d2",
+                    "number" : "0x01",
+                    "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+                    "receiptTrie" : "0x46d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003",
+                    "stateRoot" : "0xff3084198410d872dedc1e4039cbea58fa883a5ca9a28700d2857b3f2711d9c9",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb2eef9690e462c29f66d10549ba21289953ce2a4fb4a82fb26daa404bb5ffe0f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025bf901f8a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff3084198410d872dedc1e4039cbea58fa883a5ca9a28700d2857b3f2711d9c9a0b2eef9690e462c29f66d10549ba21289953ce2a4fb4a82fb26daa404bb5ffe0fa046d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0ac6515d3efad831a7c15c9974bf852ed9124150a44acd2c9b09c93ee1f312f7d880d46e25dafa607d2f85df85b80018302710080808f600160005560016000fd60116001551ca0884ea2df20e652e208d0b88719de17a2ac32b45028efe40fc98f12238b846ea0a00de33f06e5928b416a227cc1e6c272c3fe193d27af85bb619164a724ab380194c0",
+                "transactions" : [
+                    {
+                        "data" : "0x600160005560016000fd6011600155",
+                        "gasLimit" : "0x027100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x884ea2df20e652e208d0b88719de17a2ac32b45028efe40fc98f12238b846ea0",
+                        "s" : "0x0de33f06e5928b416a227cc1e6c272c3fe193d27af85bb619164a724ab380194",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf91c14b1c753af0366df68f62ea3564f0a45500e77c07ba6a93f5875d6dac4fc",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f520b3",
+                "balance" : "0x4563918244f67100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3ef4d",
+                "balance" : "0xe8d4a29f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeInInit_d0g0v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeInInit_d0g0v1.json
index 9148c5ec9..4ec3d75a0 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeInInit_d0g0v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeInInit_d0g0v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeInInit_d0g0v1_EIP150" : {
+    "RevertOpcodeInInit_d0g0v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeInInit_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x027100",
-                    "hash" : "0x09cb20e9e1ae6e2f4a000769a9e4755301a798a2fd66d56b19e9f6a9f0a320b6",
-                    "mixHash" : "0x7588f2236f856a4a787ff083ffd01779bcaeb9e112a3419fca6fcb10efb78005",
-                    "nonce" : "0x9b091ba601c5e01a",
+                    "gasUsed" : "0x0120b3",
+                    "hash" : "0xa521760e54d5c91edf27159e48857da63d66d0afe46bf9204b4702adcb2b0927",
+                    "mixHash" : "0xae18b9acbc7a6781492cbe6f3531dca080cad2f2b95213603eb43a900d159215",
+                    "nonce" : "0xb0435e2855980abd",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-                    "receiptTrie" : "0x46d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003",
-                    "stateRoot" : "0xff3084198410d872dedc1e4039cbea58fa883a5ca9a28700d2857b3f2711d9c9",
+                    "receiptTrie" : "0x055639b53c7883180bc32e4abeabb9e350ca2ee46a3c0801c95078756ce711ab",
+                    "stateRoot" : "0xee7b95ee875782592b2d19231a43b134d53b4432366181bcbd48270b59234966",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd18817373e68a1693cb973d6765a349be7df4dce8569c560fb7060c7229e5085",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025bf901f8a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff3084198410d872dedc1e4039cbea58fa883a5ca9a28700d2857b3f2711d9c9a0d18817373e68a1693cb973d6765a349be7df4dce8569c560fb7060c7229e5085a046d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a07588f2236f856a4a787ff083ffd01779bcaeb9e112a3419fca6fcb10efb78005889b091ba601c5e01af85df85b800183027100800a8f600160005560016000fd60116001551ba0d9188f1761b592e3ef2bec1274fce9097a98ad729aaa61dd6bcc9ec4f13873f8a00cf76bad20f7f2e5824c68809ecdbc6cde5bb6086c7a2548c7e0e6d6949e032fc0",
+                "rlp" : "0xf9025bf901f8a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee7b95ee875782592b2d19231a43b134d53b4432366181bcbd48270b59234966a0d18817373e68a1693cb973d6765a349be7df4dce8569c560fb7060c7229e5085a0055639b53c7883180bc32e4abeabb9e350ca2ee46a3c0801c95078756ce711abb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830120b38203e880a0ae18b9acbc7a6781492cbe6f3531dca080cad2f2b95213603eb43a900d15921588b0435e2855980abdf85df85b800183027100800a8f600160005560016000fd60116001551ba0d9188f1761b592e3ef2bec1274fce9097a98ad729aaa61dd6bcc9ec4f13873f8a00cf76bad20f7f2e5824c68809ecdbc6cde5bb6086c7a2548c7e0e6d6949e032fc0",
                 "transactions" : [
                     {
                         "data" : "0x600160005560016000fd6011600155",
@@ -62,18 +62,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x09cb20e9e1ae6e2f4a000769a9e4755301a798a2fd66d56b19e9f6a9f0a320b6",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa521760e54d5c91edf27159e48857da63d66d0afe46bf9204b4702adcb2b0927",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f67100",
+                "balance" : "0x4563918244f520b3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a29f00",
+                "balance" : "0xe8d4a3ef4d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -90,10 +97,10 @@
             }
         }
     },
-    "RevertOpcodeInInit_d0g0v1_EIP158" : {
+    "RevertOpcodeInInit_d0g0v1_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeInInit_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -104,19 +111,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x027100",
-                    "hash" : "0x8c2c4d05125f07a21cb1e9f4e99c07565b3e89b82175178b3f0d5cf5dfe910d5",
-                    "mixHash" : "0x818bb42e6cfb9f8fd28c62b0d61fe8198c9158ea0cf5bc61e4e7dd6a15339254",
-                    "nonce" : "0x7ae81a2f36625269",
+                    "gasUsed" : "0x0120b3",
+                    "hash" : "0x54d8c3a225819572b90caf861845be302c1e2633482a240453230d29a8a289a6",
+                    "mixHash" : "0x314d9f395f2c72ac6bec860fd1780d0c872e43b36e7132e12ba05ccb337519ce",
+                    "nonce" : "0x6613e0268d4d8c1b",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-                    "receiptTrie" : "0x46d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003",
-                    "stateRoot" : "0xff3084198410d872dedc1e4039cbea58fa883a5ca9a28700d2857b3f2711d9c9",
+                    "receiptTrie" : "0x055639b53c7883180bc32e4abeabb9e350ca2ee46a3c0801c95078756ce711ab",
+                    "stateRoot" : "0xee7b95ee875782592b2d19231a43b134d53b4432366181bcbd48270b59234966",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd18817373e68a1693cb973d6765a349be7df4dce8569c560fb7060c7229e5085",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025bf901f8a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff3084198410d872dedc1e4039cbea58fa883a5ca9a28700d2857b3f2711d9c9a0d18817373e68a1693cb973d6765a349be7df4dce8569c560fb7060c7229e5085a046d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0818bb42e6cfb9f8fd28c62b0d61fe8198c9158ea0cf5bc61e4e7dd6a15339254887ae81a2f36625269f85df85b800183027100800a8f600160005560016000fd60116001551ba0d9188f1761b592e3ef2bec1274fce9097a98ad729aaa61dd6bcc9ec4f13873f8a00cf76bad20f7f2e5824c68809ecdbc6cde5bb6086c7a2548c7e0e6d6949e032fc0",
+                "rlp" : "0xf9025bf901f8a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee7b95ee875782592b2d19231a43b134d53b4432366181bcbd48270b59234966a0d18817373e68a1693cb973d6765a349be7df4dce8569c560fb7060c7229e5085a0055639b53c7883180bc32e4abeabb9e350ca2ee46a3c0801c95078756ce711abb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830120b38203e880a0314d9f395f2c72ac6bec860fd1780d0c872e43b36e7132e12ba05ccb337519ce886613e0268d4d8c1bf85df85b800183027100800a8f600160005560016000fd60116001551ba0d9188f1761b592e3ef2bec1274fce9097a98ad729aaa61dd6bcc9ec4f13873f8a00cf76bad20f7f2e5824c68809ecdbc6cde5bb6086c7a2548c7e0e6d6949e032fc0",
                 "transactions" : [
                     {
                         "data" : "0x600160005560016000fd6011600155",
@@ -153,18 +160,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8c2c4d05125f07a21cb1e9f4e99c07565b3e89b82175178b3f0d5cf5dfe910d5",
-        "network" : "EIP158",
+        "lastblockhash" : "0x54d8c3a225819572b90caf861845be302c1e2633482a240453230d29a8a289a6",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f67100",
+                "balance" : "0x4563918244f520b3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a29f00",
+                "balance" : "0xe8d4a3ef4d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -181,10 +195,10 @@
             }
         }
     },
-    "RevertOpcodeInInit_d0g0v1_Frontier" : {
+    "RevertOpcodeInInit_d0g0v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeInInit_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -196,9 +210,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0x66df65d02c0dbee3e10093f77a02954a8b213800e74b8dcf63d857cbe04eefe0",
-                    "mixHash" : "0x0ed0dbf5e593215694b26b4fb03b87676e0f404e8f2e0027d210cc5c1cb3dba2",
-                    "nonce" : "0xa65a727f3e9789b6",
+                    "hash" : "0xc4de32d37e3b0a780562a802ae97932c8f72a578caa32952b4a1551d7ca3af8c",
+                    "mixHash" : "0xcc673802bc2cda44418d2a90c05f1a87a919278550d1a13737c054b4d1d3a00f",
+                    "nonce" : "0x584970d2d7e33a81",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
                     "receiptTrie" : "0x46d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003",
@@ -207,7 +221,7 @@
                     "transactionsTrie" : "0xd18817373e68a1693cb973d6765a349be7df4dce8569c560fb7060c7229e5085",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025bf901f8a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff3084198410d872dedc1e4039cbea58fa883a5ca9a28700d2857b3f2711d9c9a0d18817373e68a1693cb973d6765a349be7df4dce8569c560fb7060c7229e5085a046d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a00ed0dbf5e593215694b26b4fb03b87676e0f404e8f2e0027d210cc5c1cb3dba288a65a727f3e9789b6f85df85b800183027100800a8f600160005560016000fd60116001551ba0d9188f1761b592e3ef2bec1274fce9097a98ad729aaa61dd6bcc9ec4f13873f8a00cf76bad20f7f2e5824c68809ecdbc6cde5bb6086c7a2548c7e0e6d6949e032fc0",
+                "rlp" : "0xf9025bf901f8a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff3084198410d872dedc1e4039cbea58fa883a5ca9a28700d2857b3f2711d9c9a0d18817373e68a1693cb973d6765a349be7df4dce8569c560fb7060c7229e5085a046d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0cc673802bc2cda44418d2a90c05f1a87a919278550d1a13737c054b4d1d3a00f88584970d2d7e33a81f85df85b800183027100800a8f600160005560016000fd60116001551ba0d9188f1761b592e3ef2bec1274fce9097a98ad729aaa61dd6bcc9ec4f13873f8a00cf76bad20f7f2e5824c68809ecdbc6cde5bb6086c7a2548c7e0e6d6949e032fc0",
                 "transactions" : [
                     {
                         "data" : "0x600160005560016000fd6011600155",
@@ -244,8 +258,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x66df65d02c0dbee3e10093f77a02954a8b213800e74b8dcf63d857cbe04eefe0",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc4de32d37e3b0a780562a802ae97932c8f72a578caa32952b4a1551d7ca3af8c",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f67100",
@@ -272,10 +286,10 @@
             }
         }
     },
-    "RevertOpcodeInInit_d0g0v1_Homestead" : {
+    "RevertOpcodeInInit_d0g0v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeInInit_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -287,9 +301,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0xbecabcb46a12d57841aa19b7ffee79e6fab7b54fda4c6cb20c3d3b79d385d457",
-                    "mixHash" : "0x6fe2836939d61586a4b75bb378bfebcce712f5967809de9aa1cf0b12dddd2f21",
-                    "nonce" : "0x2a82d394fde37cf5",
+                    "hash" : "0xfc00d00c30255fbe36b683bfb3a822566d4f1efeaee5797469411281bae647dd",
+                    "mixHash" : "0x62d6ac4ef8f1aaa96bcf639b109f1d7e6b4a94ebfbc61e42ebbe27654798bfa0",
+                    "nonce" : "0x1857ff6370666efd",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
                     "receiptTrie" : "0x46d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003",
@@ -298,7 +312,7 @@
                     "transactionsTrie" : "0xd18817373e68a1693cb973d6765a349be7df4dce8569c560fb7060c7229e5085",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025bf901f8a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff3084198410d872dedc1e4039cbea58fa883a5ca9a28700d2857b3f2711d9c9a0d18817373e68a1693cb973d6765a349be7df4dce8569c560fb7060c7229e5085a046d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a06fe2836939d61586a4b75bb378bfebcce712f5967809de9aa1cf0b12dddd2f21882a82d394fde37cf5f85df85b800183027100800a8f600160005560016000fd60116001551ba0d9188f1761b592e3ef2bec1274fce9097a98ad729aaa61dd6bcc9ec4f13873f8a00cf76bad20f7f2e5824c68809ecdbc6cde5bb6086c7a2548c7e0e6d6949e032fc0",
+                "rlp" : "0xf9025bf901f8a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff3084198410d872dedc1e4039cbea58fa883a5ca9a28700d2857b3f2711d9c9a0d18817373e68a1693cb973d6765a349be7df4dce8569c560fb7060c7229e5085a046d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a062d6ac4ef8f1aaa96bcf639b109f1d7e6b4a94ebfbc61e42ebbe27654798bfa0881857ff6370666efdf85df85b800183027100800a8f600160005560016000fd60116001551ba0d9188f1761b592e3ef2bec1274fce9097a98ad729aaa61dd6bcc9ec4f13873f8a00cf76bad20f7f2e5824c68809ecdbc6cde5bb6086c7a2548c7e0e6d6949e032fc0",
                 "transactions" : [
                     {
                         "data" : "0x600160005560016000fd6011600155",
@@ -335,8 +349,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbecabcb46a12d57841aa19b7ffee79e6fab7b54fda4c6cb20c3d3b79d385d457",
-        "network" : "Homestead",
+        "lastblockhash" : "0xfc00d00c30255fbe36b683bfb3a822566d4f1efeaee5797469411281bae647dd",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f67100",
@@ -363,10 +377,10 @@
             }
         }
     },
-    "RevertOpcodeInInit_d0g0v1_Metropolis" : {
+    "RevertOpcodeInInit_d0g0v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeInInit_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -377,19 +391,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0120b3",
-                    "hash" : "0x030d56cb609bd7dd0451f7bbf10fd18aa80c1fdcf3eff549dd1f8fcd070374ff",
-                    "mixHash" : "0xe7ea7c71735563eb4ec748bb571802fc88c7836ac69a0fb4b5131baab0d737d9",
-                    "nonce" : "0x9f67d284d5b35a10",
+                    "gasUsed" : "0x027100",
+                    "hash" : "0x0d417bf1604eb7a735dbff1c9450901d9f7f28f9055b379d6baf1f0fb33cde81",
+                    "mixHash" : "0x866e62f8750608e3cff041a97c8798a5fdc96ae9d928974aec668efd3d8ae729",
+                    "nonce" : "0x03f361178b6fdde0",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-                    "receiptTrie" : "0x055639b53c7883180bc32e4abeabb9e350ca2ee46a3c0801c95078756ce711ab",
-                    "stateRoot" : "0xee7b95ee875782592b2d19231a43b134d53b4432366181bcbd48270b59234966",
+                    "receiptTrie" : "0x46d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003",
+                    "stateRoot" : "0xff3084198410d872dedc1e4039cbea58fa883a5ca9a28700d2857b3f2711d9c9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd18817373e68a1693cb973d6765a349be7df4dce8569c560fb7060c7229e5085",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025bf901f8a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee7b95ee875782592b2d19231a43b134d53b4432366181bcbd48270b59234966a0d18817373e68a1693cb973d6765a349be7df4dce8569c560fb7060c7229e5085a0055639b53c7883180bc32e4abeabb9e350ca2ee46a3c0801c95078756ce711abb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830120b38203e880a0e7ea7c71735563eb4ec748bb571802fc88c7836ac69a0fb4b5131baab0d737d9889f67d284d5b35a10f85df85b800183027100800a8f600160005560016000fd60116001551ba0d9188f1761b592e3ef2bec1274fce9097a98ad729aaa61dd6bcc9ec4f13873f8a00cf76bad20f7f2e5824c68809ecdbc6cde5bb6086c7a2548c7e0e6d6949e032fc0",
+                "rlp" : "0xf9025bf901f8a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff3084198410d872dedc1e4039cbea58fa883a5ca9a28700d2857b3f2711d9c9a0d18817373e68a1693cb973d6765a349be7df4dce8569c560fb7060c7229e5085a046d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0866e62f8750608e3cff041a97c8798a5fdc96ae9d928974aec668efd3d8ae7298803f361178b6fdde0f85df85b800183027100800a8f600160005560016000fd60116001551ba0d9188f1761b592e3ef2bec1274fce9097a98ad729aaa61dd6bcc9ec4f13873f8a00cf76bad20f7f2e5824c68809ecdbc6cde5bb6086c7a2548c7e0e6d6949e032fc0",
                 "transactions" : [
                     {
                         "data" : "0x600160005560016000fd6011600155",
@@ -426,25 +440,109 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x030d56cb609bd7dd0451f7bbf10fd18aa80c1fdcf3eff549dd1f8fcd070374ff",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x0d417bf1604eb7a735dbff1c9450901d9f7f28f9055b379d6baf1f0fb33cde81",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f67100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a29f00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeInInit_d0g0v1_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeInInit_d0g0v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x027100",
+                    "hash" : "0xf8f1dbe35b2c5d55846f1d6970f742e052475e2dbfe465d130bc0784404e389f",
+                    "mixHash" : "0xe317faa1d0c231613d5cdd08a96ff979d068b5fddb5f5348c9f7364a8b314d1a",
+                    "nonce" : "0x4dd8bb3b43a2fbb0",
+                    "number" : "0x01",
+                    "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+                    "receiptTrie" : "0x46d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003",
+                    "stateRoot" : "0xff3084198410d872dedc1e4039cbea58fa883a5ca9a28700d2857b3f2711d9c9",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd18817373e68a1693cb973d6765a349be7df4dce8569c560fb7060c7229e5085",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025bf901f8a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff3084198410d872dedc1e4039cbea58fa883a5ca9a28700d2857b3f2711d9c9a0d18817373e68a1693cb973d6765a349be7df4dce8569c560fb7060c7229e5085a046d07390d9e8ea20bb9c6105ec27fde5d2ade2708bd2e97f04ca44acbc63b003b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0e317faa1d0c231613d5cdd08a96ff979d068b5fddb5f5348c9f7364a8b314d1a884dd8bb3b43a2fbb0f85df85b800183027100800a8f600160005560016000fd60116001551ba0d9188f1761b592e3ef2bec1274fce9097a98ad729aaa61dd6bcc9ec4f13873f8a00cf76bad20f7f2e5824c68809ecdbc6cde5bb6086c7a2548c7e0e6d6949e032fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x600160005560016000fd6011600155",
+                        "gasLimit" : "0x027100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd9188f1761b592e3ef2bec1274fce9097a98ad729aaa61dd6bcc9ec4f13873f8",
+                        "s" : "0x0cf76bad20f7f2e5824c68809ecdbc6cde5bb6086c7a2548c7e0e6d6949e032f",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf8f1dbe35b2c5d55846f1d6970f742e052475e2dbfe465d130bc0784404e389f",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f520b3",
+                "balance" : "0x4563918244f67100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3ef4d",
+                "balance" : "0xe8d4a29f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeInInit_d0g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeInInit_d0g1v0.json
index e250ae421..31d5b61d5 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeInInit_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeInInit_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeInInit_d0g1v0_EIP150" : {
+    "RevertOpcodeInInit_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeInInit_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x14a5714589a4fcfdb807857903380cebe57743a53be8db87c51d76989dd11e0b",
-                    "mixHash" : "0x35656da132b56304031e5b7458cd5829be2639c6183a34b0f6448a70dee605ed",
-                    "nonce" : "0x92412f955b33b83d",
+                    "hash" : "0x369c288c5476adf95b72920bbc8416542080c2b4a5b56b6944cc655e68acc3d5",
+                    "mixHash" : "0x53efaa89647116a85eec799034629820d1ebe16ac56e096d0c7f598031dc0994",
+                    "nonce" : "0xd55f46d0bcdf2bd0",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x39715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20f",
+                    "stateRoot" : "0x48c958cc916e759f1ed7023e20896323fa50ba8027588967b0812dcfd1e87127",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a035656da132b56304031e5b7458cd5829be2639c6183a34b0f6448a70dee605ed8892412f955b33b83dc0c0",
+                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048c958cc916e759f1ed7023e20896323fa50ba8027588967b0812dcfd1e87127a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a053efaa89647116a85eec799034629820d1ebe16ac56e096d0c7f598031dc099488d55f46d0bcdf2bd0c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x14a5714589a4fcfdb807857903380cebe57743a53be8db87c51d76989dd11e0b",
-        "network" : "EIP150",
+        "lastblockhash" : "0x369c288c5476adf95b72920bbc8416542080c2b4a5b56b6944cc655e68acc3d5",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -79,10 +86,10 @@
             }
         }
     },
-    "RevertOpcodeInInit_d0g1v0_EIP158" : {
+    "RevertOpcodeInInit_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeInInit_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -94,18 +101,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x8c6369294f3d1596755da54b76570644ea4e8cc69c99f84392774cbb5b4293a5",
-                    "mixHash" : "0x2f4f1925292e7ba3c32a171d3d557385ac689abd77cf7e14f816e00b4170ed51",
-                    "nonce" : "0xd7cb12b36089e580",
+                    "hash" : "0x6f5a354cf87b045464a07df50482dec6298a4fb945542f26d71f53d9b9624138",
+                    "mixHash" : "0xa1e46ae034d596b435fb8eac6476c91a7c3a8dbcb365c856a36ba04d29a9c15f",
+                    "nonce" : "0xc4f0ac21213a7b41",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x39715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20f",
+                    "stateRoot" : "0x48c958cc916e759f1ed7023e20896323fa50ba8027588967b0812dcfd1e87127",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a02f4f1925292e7ba3c32a171d3d557385ac689abd77cf7e14f816e00b4170ed5188d7cb12b36089e580c0c0",
+                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048c958cc916e759f1ed7023e20896323fa50ba8027588967b0812dcfd1e87127a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0a1e46ae034d596b435fb8eac6476c91a7c3a8dbcb365c856a36ba04d29a9c15f88c4f0ac21213a7b41c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -131,9 +138,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8c6369294f3d1596755da54b76570644ea4e8cc69c99f84392774cbb5b4293a5",
-        "network" : "EIP158",
+        "lastblockhash" : "0x6f5a354cf87b045464a07df50482dec6298a4fb945542f26d71f53d9b9624138",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -159,10 +173,10 @@
             }
         }
     },
-    "RevertOpcodeInInit_d0g1v0_Frontier" : {
+    "RevertOpcodeInInit_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeInInit_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -173,31 +187,20 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x9c40",
-                    "hash" : "0xf72a928bbec184697478a4de2f5e5577b365d9fd9f27de4eb1ee7516affb7bc5",
-                    "mixHash" : "0x67699311a07a0e9fa1bb5a56e01245c9daec18b36fc91a4f4c70b47a4b17de0b",
-                    "nonce" : "0x3eecf0d0c0f8938d",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x9516de2c1ce19284cbe37ac2446de51c4264ee607cf131e1dbfbbbce3a46eecd",
+                    "mixHash" : "0x3adb8ff24a316eba8ec9175ed6832742d33387de0790c2d44be7ab3c28f852d5",
+                    "nonce" : "0x83d847eaa4c8c6a0",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-                    "receiptTrie" : "0xd2b034eb827c9fa799ac222889f8d2d82809255f75b03a8a25ee6970f963c817",
-                    "stateRoot" : "0x597c8ce70b7c50fe3e90f48e58b7c4c0a8ed3f5803b1a8698ea27c4381e25807",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x39715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20f",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x067baa92419ddec8a9f8d868ac9c0d8319187fcca730f701b06f3a4ad9adacdc",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90259f901f7a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0597c8ce70b7c50fe3e90f48e58b7c4c0a8ed3f5803b1a8698ea27c4381e25807a0067baa92419ddec8a9f8d868ac9c0d8319187fcca730f701b06f3a4ad9adacdca0d2b034eb827c9fa799ac222889f8d2d82809255f75b03a8a25ee6970f963c817b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680829c408203e880a067699311a07a0e9fa1bb5a56e01245c9daec18b36fc91a4f4c70b47a4b17de0b883eecf0d0c0f8938df85cf85a8001829c4080808f600160005560016000fd60116001551ca0edd774a34061a13d5fda9175c48831935503ffe4b698f724202b9869ad6f0a58a04fdf5c259a4fd4382a4b79be2ab7cffeeaa1d8d1b5456ae7bad6b407f0a15aabc0",
+                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a03adb8ff24a316eba8ec9175ed6832742d33387de0790c2d44be7ab3c28f852d58883d847eaa4c8c6a0c0c0",
                 "transactions" : [
-                    {
-                        "data" : "0x600160005560016000fd6011600155",
-                        "gasLimit" : "0x9c40",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xedd774a34061a13d5fda9175c48831935503ffe4b698f724202b9869ad6f0a58",
-                        "s" : "0x4fdf5c259a4fd4382a4b79be2ab7cffeeaa1d8d1b5456ae7bad6b407f0a15aab",
-                        "to" : "",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
                 ],
                 "uncleHeaders" : [
                 ]
@@ -222,20 +225,20 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf72a928bbec184697478a4de2f5e5577b365d9fd9f27de4eb1ee7516affb7bc5",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9516de2c1ce19284cbe37ac2446de51c4264ee607cf131e1dbfbbbce3a46eecd",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49c40",
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a473c0",
+                "balance" : "0xe8d4a51000",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -250,10 +253,10 @@
             }
         }
     },
-    "RevertOpcodeInInit_d0g1v0_Homestead" : {
+    "RevertOpcodeInInit_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeInInit_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -265,9 +268,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x789e969a75582f43e1d1c1bcc84d7379bb407bd34e12a628396bb242e2d01fac",
-                    "mixHash" : "0x74db9532c3393c80816d01472c5fe7de9ee88dff10944523c725bedc13732849",
-                    "nonce" : "0xe5f9b427d7c9e1f8",
+                    "hash" : "0x27ae661fe0a9606594856498a3f3b2f2c9c9234b10f51cac21efdc96bcf9402f",
+                    "mixHash" : "0x91cec55878227e69e26a68fb4524fd79fc1292da3e78d8e3ef12f92d99375278",
+                    "nonce" : "0xce65ec48f49c7339",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -276,7 +279,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a074db9532c3393c80816d01472c5fe7de9ee88dff10944523c725bedc1373284988e5f9b427d7c9e1f8c0c0",
+                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a091cec55878227e69e26a68fb4524fd79fc1292da3e78d8e3ef12f92d9937527888ce65ec48f49c7339c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -302,8 +305,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x789e969a75582f43e1d1c1bcc84d7379bb407bd34e12a628396bb242e2d01fac",
-        "network" : "Homestead",
+        "lastblockhash" : "0x27ae661fe0a9606594856498a3f3b2f2c9c9234b10f51cac21efdc96bcf9402f",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
@@ -330,10 +333,10 @@
             }
         }
     },
-    "RevertOpcodeInInit_d0g1v0_Metropolis" : {
+    "RevertOpcodeInInit_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeInInit_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -344,20 +347,31 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x026619528085bfe23228806d60349e634d11891dc93e7c7069e09a39440a055a",
-                    "mixHash" : "0x6c599b83afbb98e5fc18b60006a26dfa3f7385f48206c443f2e6ad4a3ee87f7d",
-                    "nonce" : "0x5513f1102a0bcd7a",
+                    "gasUsed" : "0x9c40",
+                    "hash" : "0xcbd4752e0fcd10fc6d3ae409e460ac5e011072cc163ee464e201baf5caed6e7d",
+                    "mixHash" : "0xbb63fe7b7e1d113f33942fd8d712ff01ee26eebedc00175b71a2e393e47d8b9f",
+                    "nonce" : "0x67bd46bd65ab52f8",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x48c958cc916e759f1ed7023e20896323fa50ba8027588967b0812dcfd1e87127",
+                    "receiptTrie" : "0xd2b034eb827c9fa799ac222889f8d2d82809255f75b03a8a25ee6970f963c817",
+                    "stateRoot" : "0x597c8ce70b7c50fe3e90f48e58b7c4c0a8ed3f5803b1a8698ea27c4381e25807",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "transactionsTrie" : "0x067baa92419ddec8a9f8d868ac9c0d8319187fcca730f701b06f3a4ad9adacdc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048c958cc916e759f1ed7023e20896323fa50ba8027588967b0812dcfd1e87127a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a06c599b83afbb98e5fc18b60006a26dfa3f7385f48206c443f2e6ad4a3ee87f7d885513f1102a0bcd7ac0c0",
+                "rlp" : "0xf90259f901f7a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0597c8ce70b7c50fe3e90f48e58b7c4c0a8ed3f5803b1a8698ea27c4381e25807a0067baa92419ddec8a9f8d868ac9c0d8319187fcca730f701b06f3a4ad9adacdca0d2b034eb827c9fa799ac222889f8d2d82809255f75b03a8a25ee6970f963c817b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680829c408203e880a0bb63fe7b7e1d113f33942fd8d712ff01ee26eebedc00175b71a2e393e47d8b9f8867bd46bd65ab52f8f85cf85a8001829c4080808f600160005560016000fd60116001551ca0edd774a34061a13d5fda9175c48831935503ffe4b698f724202b9869ad6f0a58a04fdf5c259a4fd4382a4b79be2ab7cffeeaa1d8d1b5456ae7bad6b407f0a15aabc0",
                 "transactions" : [
+                    {
+                        "data" : "0x600160005560016000fd6011600155",
+                        "gasLimit" : "0x9c40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xedd774a34061a13d5fda9175c48831935503ffe4b698f724202b9869ad6f0a58",
+                        "s" : "0x4fdf5c259a4fd4382a4b79be2ab7cffeeaa1d8d1b5456ae7bad6b407f0a15aab",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
                 ],
                 "uncleHeaders" : [
                 ]
@@ -382,16 +396,89 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x026619528085bfe23228806d60349e634d11891dc93e7c7069e09a39440a055a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xcbd4752e0fcd10fc6d3ae409e460ac5e011072cc163ee464e201baf5caed6e7d",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f49c40",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a473c0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeInInit_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeInInit_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xa83e46285c1491b6bea2e18d45f252cefd0cf5f18e2fbed26851cab661e88fe0",
+                    "mixHash" : "0xcb7a9f01b0f564f227405fdad6d446e7409c81b05d5751a0cd3b116f228b1339",
+                    "nonce" : "0xb361db0420199abd",
+                    "number" : "0x01",
+                    "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x39715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0cb7a9f01b0f564f227405fdad6d446e7409c81b05d5751a0cd3b116f228b133988b361db0420199abdc0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa83e46285c1491b6bea2e18d45f252cefd0cf5f18e2fbed26851cab661e88fe0",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeInInit_d0g1v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeInInit_d0g1v1.json
index 6634e63bd..6d121f0c1 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeInInit_d0g1v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeInInit_d0g1v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeInInit_d0g1v1_EIP150" : {
+    "RevertOpcodeInInit_d0g1v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeInInit_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x3812aedffc55848f2748635210da8931e284fd504f90a64cdd45f2e9cc2c7dd3",
-                    "mixHash" : "0x5623247825a6751185de100af441f6c156ef7d9d6dc8afb7ce350a029eebc6c6",
-                    "nonce" : "0xd552e294352bc1a7",
+                    "hash" : "0x8af08440dc17e455a9a120026b063d313545358b3615a56fb207a76431181073",
+                    "mixHash" : "0xc75a2bba2b792034d062a847790f4dd8919153d25f022d009d67fa908b2830be",
+                    "nonce" : "0xd9e0c75637b34935",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x39715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20f",
+                    "stateRoot" : "0x48c958cc916e759f1ed7023e20896323fa50ba8027588967b0812dcfd1e87127",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a05623247825a6751185de100af441f6c156ef7d9d6dc8afb7ce350a029eebc6c688d552e294352bc1a7c0c0",
+                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048c958cc916e759f1ed7023e20896323fa50ba8027588967b0812dcfd1e87127a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0c75a2bba2b792034d062a847790f4dd8919153d25f022d009d67fa908b2830be88d9e0c75637b34935c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3812aedffc55848f2748635210da8931e284fd504f90a64cdd45f2e9cc2c7dd3",
-        "network" : "EIP150",
+        "lastblockhash" : "0x8af08440dc17e455a9a120026b063d313545358b3615a56fb207a76431181073",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -79,10 +86,10 @@
             }
         }
     },
-    "RevertOpcodeInInit_d0g1v1_EIP158" : {
+    "RevertOpcodeInInit_d0g1v1_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeInInit_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -94,18 +101,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0x3aa6ec070bcd1582903dda953957a8ba8016802c63f28f01b3c6a01ef216bd13",
-                    "mixHash" : "0x53c16447d7738b91a43213ba391bb0d856e5958576bb7cb8bb165b72b19e5109",
-                    "nonce" : "0xb8f1bd7275bc9989",
+                    "hash" : "0xbd5d1b719ff3c28f0b4796f22aae6dffead66fb6aad095d6a9298b78dbc3981b",
+                    "mixHash" : "0x3ad5569e0dd7a45ec12e0f50099ac277f5f9550d63a18ceca5461cbe9f0a1b38",
+                    "nonce" : "0xf63f998a9e8308e2",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x39715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20f",
+                    "stateRoot" : "0x48c958cc916e759f1ed7023e20896323fa50ba8027588967b0812dcfd1e87127",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a053c16447d7738b91a43213ba391bb0d856e5958576bb7cb8bb165b72b19e510988b8f1bd7275bc9989c0c0",
+                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048c958cc916e759f1ed7023e20896323fa50ba8027588967b0812dcfd1e87127a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a03ad5569e0dd7a45ec12e0f50099ac277f5f9550d63a18ceca5461cbe9f0a1b3888f63f998a9e8308e2c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -131,9 +138,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3aa6ec070bcd1582903dda953957a8ba8016802c63f28f01b3c6a01ef216bd13",
-        "network" : "EIP158",
+        "lastblockhash" : "0xbd5d1b719ff3c28f0b4796f22aae6dffead66fb6aad095d6a9298b78dbc3981b",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -159,10 +173,10 @@
             }
         }
     },
-    "RevertOpcodeInInit_d0g1v1_Frontier" : {
+    "RevertOpcodeInInit_d0g1v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeInInit_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -173,31 +187,20 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x9c40",
-                    "hash" : "0x7a17931844f9140d86297f45dea34917b4749d79b238de5e812b6dea511b3c47",
-                    "mixHash" : "0xeb419b613c346591808e18dac933992b471cb8309ba11a30a2f9d0610b6cf2a1",
-                    "nonce" : "0x19f91e356e269bc8",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x453095c274060bedb956136a7ab48af991dffa3ffdded0a77085db86343892ef",
+                    "mixHash" : "0x0f8de6e69e598f311d4e4b705039cf4689577912c47faf0adf11e806caac7ebf",
+                    "nonce" : "0xdf225fb8a395fe94",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-                    "receiptTrie" : "0xd2b034eb827c9fa799ac222889f8d2d82809255f75b03a8a25ee6970f963c817",
-                    "stateRoot" : "0x597c8ce70b7c50fe3e90f48e58b7c4c0a8ed3f5803b1a8698ea27c4381e25807",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x39715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20f",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xe432822c10ac76b82bfb468cd9b1ac2e36b291bfba820db4841636e7465c05e0",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90259f901f7a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0597c8ce70b7c50fe3e90f48e58b7c4c0a8ed3f5803b1a8698ea27c4381e25807a0e432822c10ac76b82bfb468cd9b1ac2e36b291bfba820db4841636e7465c05e0a0d2b034eb827c9fa799ac222889f8d2d82809255f75b03a8a25ee6970f963c817b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680829c408203e880a0eb419b613c346591808e18dac933992b471cb8309ba11a30a2f9d0610b6cf2a18819f91e356e269bc8f85cf85a8001829c40800a8f600160005560016000fd60116001551ba0e6dc8dd91ade4a163bcc33c6ac4cf36df0d0c73a7edd4ee8f01f7f00b1d478d5a02b505f18cdf7dece0e9fd7d5931dfd6d62436556012394fb68035f2e269360fcc0",
+                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a00f8de6e69e598f311d4e4b705039cf4689577912c47faf0adf11e806caac7ebf88df225fb8a395fe94c0c0",
                 "transactions" : [
-                    {
-                        "data" : "0x600160005560016000fd6011600155",
-                        "gasLimit" : "0x9c40",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xe6dc8dd91ade4a163bcc33c6ac4cf36df0d0c73a7edd4ee8f01f7f00b1d478d5",
-                        "s" : "0x2b505f18cdf7dece0e9fd7d5931dfd6d62436556012394fb68035f2e269360fc",
-                        "to" : "",
-                        "v" : "0x1b",
-                        "value" : "0x0a"
-                    }
                 ],
                 "uncleHeaders" : [
                 ]
@@ -222,20 +225,20 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7a17931844f9140d86297f45dea34917b4749d79b238de5e812b6dea511b3c47",
-        "network" : "Frontier",
+        "lastblockhash" : "0x453095c274060bedb956136a7ab48af991dffa3ffdded0a77085db86343892ef",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49c40",
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a473c0",
+                "balance" : "0xe8d4a51000",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -250,10 +253,10 @@
             }
         }
     },
-    "RevertOpcodeInInit_d0g1v1_Homestead" : {
+    "RevertOpcodeInInit_d0g1v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeInInit_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -265,9 +268,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x00",
-                    "hash" : "0xa67685762d5a14e4ce54a5327afb94fe537b47edd28052ff2bd5c134c411682b",
-                    "mixHash" : "0xa49fc65b85cfc4148786d86aa78a80b9dbae536a78d4e880e578295baf327859",
-                    "nonce" : "0x5655d41fecab6fae",
+                    "hash" : "0x2ad071ac70e958d8fc41e1485634470129fbcb29b4eec1dfd94b4aeff8992503",
+                    "mixHash" : "0x5d766b17440cb5323bb362f029bbd80c54e4f6f71ec06434cd55acb9aa6c3b8c",
+                    "nonce" : "0xdcad73dae00ac2a3",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -276,7 +279,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0a49fc65b85cfc4148786d86aa78a80b9dbae536a78d4e880e578295baf327859885655d41fecab6faec0c0",
+                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a05d766b17440cb5323bb362f029bbd80c54e4f6f71ec06434cd55acb9aa6c3b8c88dcad73dae00ac2a3c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -302,8 +305,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa67685762d5a14e4ce54a5327afb94fe537b47edd28052ff2bd5c134c411682b",
-        "network" : "Homestead",
+        "lastblockhash" : "0x2ad071ac70e958d8fc41e1485634470129fbcb29b4eec1dfd94b4aeff8992503",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
@@ -330,10 +333,10 @@
             }
         }
     },
-    "RevertOpcodeInInit_d0g1v1_Metropolis" : {
+    "RevertOpcodeInInit_d0g1v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeInInit_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -344,20 +347,31 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x06e6882685049be73dc8e86d3948882231e5184a74aa0fa00fe3c93c9289117c",
-                    "mixHash" : "0xb863d4ef91147e8d881afc11e7a2a7e1ef1ceb1ef5547112a7c1c85d21bc6452",
-                    "nonce" : "0xca336d76878391ab",
+                    "gasUsed" : "0x9c40",
+                    "hash" : "0x7836cf5d276db0270587fba924e8787af55a298d5e5b01c6e33273420e4de32b",
+                    "mixHash" : "0x3747ea711b85ea90f6234177721e1b0a55027635fdf8057e6a25d4022eb06dc9",
+                    "nonce" : "0x3df5f571601e7967",
                     "number" : "0x01",
                     "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x48c958cc916e759f1ed7023e20896323fa50ba8027588967b0812dcfd1e87127",
+                    "receiptTrie" : "0xd2b034eb827c9fa799ac222889f8d2d82809255f75b03a8a25ee6970f963c817",
+                    "stateRoot" : "0x597c8ce70b7c50fe3e90f48e58b7c4c0a8ed3f5803b1a8698ea27c4381e25807",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "transactionsTrie" : "0xe432822c10ac76b82bfb468cd9b1ac2e36b291bfba820db4841636e7465c05e0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048c958cc916e759f1ed7023e20896323fa50ba8027588967b0812dcfd1e87127a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a0b863d4ef91147e8d881afc11e7a2a7e1ef1ceb1ef5547112a7c1c85d21bc645288ca336d76878391abc0c0",
+                "rlp" : "0xf90259f901f7a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0597c8ce70b7c50fe3e90f48e58b7c4c0a8ed3f5803b1a8698ea27c4381e25807a0e432822c10ac76b82bfb468cd9b1ac2e36b291bfba820db4841636e7465c05e0a0d2b034eb827c9fa799ac222889f8d2d82809255f75b03a8a25ee6970f963c817b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680829c408203e880a03747ea711b85ea90f6234177721e1b0a55027635fdf8057e6a25d4022eb06dc9883df5f571601e7967f85cf85a8001829c40800a8f600160005560016000fd60116001551ba0e6dc8dd91ade4a163bcc33c6ac4cf36df0d0c73a7edd4ee8f01f7f00b1d478d5a02b505f18cdf7dece0e9fd7d5931dfd6d62436556012394fb68035f2e269360fcc0",
                 "transactions" : [
+                    {
+                        "data" : "0x600160005560016000fd6011600155",
+                        "gasLimit" : "0x9c40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe6dc8dd91ade4a163bcc33c6ac4cf36df0d0c73a7edd4ee8f01f7f00b1d478d5",
+                        "s" : "0x2b505f18cdf7dece0e9fd7d5931dfd6d62436556012394fb68035f2e269360fc",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
                 ],
                 "uncleHeaders" : [
                 ]
@@ -382,16 +396,89 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x06e6882685049be73dc8e86d3948882231e5184a74aa0fa00fe3c93c9289117c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x7836cf5d276db0270587fba924e8787af55a298d5e5b01c6e33273420e4de32b",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f49c40",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a473c0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeInInit_d0g1v1_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeInInit_d0g1v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x75ee1a895832f103e2bb6b8aa7b80fca38aae3e766b1ddc9557c02a95b377224",
+                    "mixHash" : "0x3711228c7ce3a0eb08e5abb1cc664155cb8b0da02a11e032aa48184e5bb78eed",
+                    "nonce" : "0x6fdb473c6283ceb8",
+                    "number" : "0x01",
+                    "parentHash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x39715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a035095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039715de6b148bb6b1f2a12f7af929bc6b366242d7648b35bce06870cdb41c20fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680808203e880a03711228c7ce3a0eb08e5abb1cc664155cb8b0da02a11e032aa48184e5bb78eed886fdb473c6283ceb8c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x35095b1590cfa9eed610b5b60904000ac9a8448da13600b40cc80c26458e7326",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x17ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017ca3d673553cbfcf5de4a99ea08088763bbf64aa67ae17a485f585bcc01d3f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x75ee1a895832f103e2bb6b8aa7b80fca38aae3e766b1ddc9557c02a95b377224",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g0v0.json
index ff4dbbd05..c474c95a4 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d0g0v0_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_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/stRevertTest/RevertOpcodeMultipleSubCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x037eeb",
-                    "hash" : "0x515b1f3b1af056776775b7430f430ae189e48cc6d72381bbf639465cff24aa44",
-                    "mixHash" : "0x30ff4f21924a3f145a7ca61cd18fea61985debbb6ecbc4f2ad401695715ecfc6",
-                    "nonce" : "0x5b7fb9a784328c5d",
+                    "gasUsed" : "0x021f88",
+                    "hash" : "0x27d251ec3d2fe97ee292e8b21670c4416a3aa9dfe57c74514f426bf0cbc4b0b5",
+                    "mixHash" : "0xa33f3f2d92caa633aae54dedb0b28b3be358587aeb8b0e9607c19e8291107b5f",
+                    "nonce" : "0xd21a38b2e832abef",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xc9d906dca422e2da3ab41dc1767fbdbac2ffdd291fa5403d853c9269f7db7a2d",
-                    "stateRoot" : "0xed9d02151734e1646c0dfac992a17bbe607afeac0ac88067716bd1f314795c56",
+                    "receiptTrie" : "0x73ffc464b3c71b246e079dec87fc3e85ed52fb232d3aa6abfccceadb47864911",
+                    "stateRoot" : "0x04f402d36fab515715e3881610d4429598220617aeecd4f1677e2db5df52f678",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x776f088479a78d23403f4a72447ec7f1ba279d7e203500b912c8617973b890c3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed9d02151734e1646c0dfac992a17bbe607afeac0ac88067716bd1f314795c56a0776f088479a78d23403f4a72447ec7f1ba279d7e203500b912c8617973b890c3a0c9d906dca422e2da3ab41dc1767fbdbac2ffdd291fa5403d853c9269f7db7a2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083037eeb8203e880a030ff4f21924a3f145a7ca61cd18fea61985debbb6ecbc4f2ad401695715ecfc6885b7fb9a784328c5df882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca0bb22121b14802c00aeeab58c784574b6652de624f70befd384c8987e2c0a55cca0490a5791b2d0a8802ce93ed2895089d8834e4c382ad7ed32e0ab6bf1e0c8f291c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004f402d36fab515715e3881610d4429598220617aeecd4f1677e2db5df52f678a0776f088479a78d23403f4a72447ec7f1ba279d7e203500b912c8617973b890c3a073ffc464b3c71b246e079dec87fc3e85ed52fb232d3aa6abfccceadb47864911b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021f888203e880a0a33f3f2d92caa633aae54dedb0b28b3be358587aeb8b0e9607c19e8291107b5f88d21a38b2e832abeff882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca0bb22121b14802c00aeeab58c784574b6652de624f70befd384c8987e2c0a55cca0490a5791b2d0a8802ce93ed2895089d8834e4c382ad7ed32e0ab6bf1e0c8f291c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x515b1f3b1af056776775b7430f430ae189e48cc6d72381bbf639465cff24aa44",
-        "network" : "EIP150",
+        "lastblockhash" : "0x27d251ec3d2fe97ee292e8b21670c4416a3aa9dfe57c74514f426bf0cbc4b0b5",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f77eeb",
+                "balance" : "0x4563918244f61f88",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -103,7 +110,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a19115",
+                "balance" : "0xe8d4a2f078",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -204,10 +211,222 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g0v0_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x021f88",
+                    "hash" : "0x06fad8af59ab8b12fc85a06b7f2c4857e8ce1ee7d51a86f8ad34ebb7173e1759",
+                    "mixHash" : "0xbf692ee8541fe50e7a21be17113dbfd11e5879ff4bd7d221076f431d16eb1afd",
+                    "nonce" : "0xa474da860f11db66",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0x73ffc464b3c71b246e079dec87fc3e85ed52fb232d3aa6abfccceadb47864911",
+                    "stateRoot" : "0x04f402d36fab515715e3881610d4429598220617aeecd4f1677e2db5df52f678",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x776f088479a78d23403f4a72447ec7f1ba279d7e203500b912c8617973b890c3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004f402d36fab515715e3881610d4429598220617aeecd4f1677e2db5df52f678a0776f088479a78d23403f4a72447ec7f1ba279d7e203500b912c8617973b890c3a073ffc464b3c71b246e079dec87fc3e85ed52fb232d3aa6abfccceadb47864911b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021f888203e880a0bf692ee8541fe50e7a21be17113dbfd11e5879ff4bd7d221076f431d16eb1afd88a474da860f11db66f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca0bb22121b14802c00aeeab58c784574b6652de624f70befd384c8987e2c0a55cca0490a5791b2d0a8802ce93ed2895089d8834e4c382ad7ed32e0ab6bf1e0c8f291c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
+                        "gasLimit" : "0x0c3500",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbb22121b14802c00aeeab58c784574b6652de624f70befd384c8987e2c0a55cc",
+                        "s" : "0x490a5791b2d0a8802ce93ed2895089d8834e4c382ad7ed32e0ab6bf1e0c8f291",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x06fad8af59ab8b12fc85a06b7f2c4857e8ce1ee7d51a86f8ad34ebb7173e1759",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f61f88",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c"
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2f078",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_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/stRevertTest/RevertOpcodeMultipleSubCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -219,9 +438,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x037eeb",
-                    "hash" : "0x86e9d7737d74956631b409bd8790e724711f6101c4b0eae4da4a937c28520a66",
-                    "mixHash" : "0xa73dc208d1ac35ff8a7e2c0de8c5ba4bf4a160725473830d7d62cece19ddd038",
-                    "nonce" : "0xfeae7ca1fd124bba",
+                    "hash" : "0x84ed93406e6521f11f1ff269a1aa89ed3454a651fc4957bb4b96cef55e800e34",
+                    "mixHash" : "0xe2b9fe9dca372c87b128c3aad311c3e0f83bc38b92de4529dd3e02437321495d",
+                    "nonce" : "0x18d593513f23bb5a",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xc9d906dca422e2da3ab41dc1767fbdbac2ffdd291fa5403d853c9269f7db7a2d",
@@ -230,7 +449,7 @@
                     "transactionsTrie" : "0x776f088479a78d23403f4a72447ec7f1ba279d7e203500b912c8617973b890c3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed9d02151734e1646c0dfac992a17bbe607afeac0ac88067716bd1f314795c56a0776f088479a78d23403f4a72447ec7f1ba279d7e203500b912c8617973b890c3a0c9d906dca422e2da3ab41dc1767fbdbac2ffdd291fa5403d853c9269f7db7a2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083037eeb8203e880a0a73dc208d1ac35ff8a7e2c0de8c5ba4bf4a160725473830d7d62cece19ddd03888feae7ca1fd124bbaf882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca0bb22121b14802c00aeeab58c784574b6652de624f70befd384c8987e2c0a55cca0490a5791b2d0a8802ce93ed2895089d8834e4c382ad7ed32e0ab6bf1e0c8f291c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed9d02151734e1646c0dfac992a17bbe607afeac0ac88067716bd1f314795c56a0776f088479a78d23403f4a72447ec7f1ba279d7e203500b912c8617973b890c3a0c9d906dca422e2da3ab41dc1767fbdbac2ffdd291fa5403d853c9269f7db7a2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083037eeb8203e880a0e2b9fe9dca372c87b128c3aad311c3e0f83bc38b92de4529dd3e02437321495d8818d593513f23bb5af882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca0bb22121b14802c00aeeab58c784574b6652de624f70befd384c8987e2c0a55cca0490a5791b2d0a8802ce93ed2895089d8834e4c382ad7ed32e0ab6bf1e0c8f291c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -267,8 +486,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x86e9d7737d74956631b409bd8790e724711f6101c4b0eae4da4a937c28520a66",
-        "network" : "EIP158",
+        "lastblockhash" : "0x84ed93406e6521f11f1ff269a1aa89ed3454a651fc4957bb4b96cef55e800e34",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f77eeb",
@@ -409,10 +628,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g0v0_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_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/stRevertTest/RevertOpcodeMultipleSubCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -423,19 +642,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x03749b",
-                    "hash" : "0x6f5334427c290e730ce30acb7955b45d954622d345601778844c6ed9d47eee58",
-                    "mixHash" : "0xccfa2f645ba2cb5110eddfe7c005686a2468558e66b56f8f9cb883e0e0d170cf",
-                    "nonce" : "0x3efe95be78dac470",
+                    "gasUsed" : "0x037eeb",
+                    "hash" : "0x23c5d3aa9c4a01c88e284e7f4ed432416d102c3ecc2b05cbeb8ffb09026b85d6",
+                    "mixHash" : "0x0caae3c784ff209f29dbb8cd27ce8a2f202b1314a65931e8d251c842e1ca0810",
+                    "nonce" : "0x9e16b81a78debd39",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x7740acacc1ca0e05aabce37bdb33256dd476efc8df14e4db193772ba27827c6f",
-                    "stateRoot" : "0xec3a382c62ea7fa0d3aeec938ee49b9158e14eb0d761b69166a8d41c148e6cf0",
+                    "receiptTrie" : "0xc9d906dca422e2da3ab41dc1767fbdbac2ffdd291fa5403d853c9269f7db7a2d",
+                    "stateRoot" : "0xed9d02151734e1646c0dfac992a17bbe607afeac0ac88067716bd1f314795c56",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x776f088479a78d23403f4a72447ec7f1ba279d7e203500b912c8617973b890c3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec3a382c62ea7fa0d3aeec938ee49b9158e14eb0d761b69166a8d41c148e6cf0a0776f088479a78d23403f4a72447ec7f1ba279d7e203500b912c8617973b890c3a07740acacc1ca0e05aabce37bdb33256dd476efc8df14e4db193772ba27827c6fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808303749b8203e880a0ccfa2f645ba2cb5110eddfe7c005686a2468558e66b56f8f9cb883e0e0d170cf883efe95be78dac470f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca0bb22121b14802c00aeeab58c784574b6652de624f70befd384c8987e2c0a55cca0490a5791b2d0a8802ce93ed2895089d8834e4c382ad7ed32e0ab6bf1e0c8f291c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed9d02151734e1646c0dfac992a17bbe607afeac0ac88067716bd1f314795c56a0776f088479a78d23403f4a72447ec7f1ba279d7e203500b912c8617973b890c3a0c9d906dca422e2da3ab41dc1767fbdbac2ffdd291fa5403d853c9269f7db7a2db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083037eeb8203e880a00caae3c784ff209f29dbb8cd27ce8a2f202b1314a65931e8d251c842e1ca0810889e16b81a78debd39f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca0bb22121b14802c00aeeab58c784574b6652de624f70befd384c8987e2c0a55cca0490a5791b2d0a8802ce93ed2895089d8834e4c382ad7ed32e0ab6bf1e0c8f291c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -472,11 +691,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6f5334427c290e730ce30acb7955b45d954622d345601778844c6ed9d47eee58",
-        "network" : "Frontier",
+        "lastblockhash" : "0x23c5d3aa9c4a01c88e284e7f4ed432416d102c3ecc2b05cbeb8ffb09026b85d6",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f7749b",
+                "balance" : "0x4563918244f77eeb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -513,7 +732,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a19b65",
+                "balance" : "0xe8d4a19115",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -614,10 +833,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g0v0_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_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/stRevertTest/RevertOpcodeMultipleSubCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -629,9 +848,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x03749b",
-                    "hash" : "0xceff443485a8ed701f17be0e1467b0034e1de2e974acdb5226d7409b702302bb",
-                    "mixHash" : "0x3062a2d36d2dffed0d1f599ab048b03f80c992dc4c09e6485a06d878583d9e75",
-                    "nonce" : "0x503b367f63a3b93f",
+                    "hash" : "0x8ae3fc58844c94861871de3009842dbc7011a06bab68374a4388e41556662c75",
+                    "mixHash" : "0x43eb9e046910e85f235cd11803f48e189e180b2087349fd285582c67474aeebb",
+                    "nonce" : "0xbd5723155724dc8d",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x7740acacc1ca0e05aabce37bdb33256dd476efc8df14e4db193772ba27827c6f",
@@ -640,7 +859,7 @@
                     "transactionsTrie" : "0x776f088479a78d23403f4a72447ec7f1ba279d7e203500b912c8617973b890c3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec3a382c62ea7fa0d3aeec938ee49b9158e14eb0d761b69166a8d41c148e6cf0a0776f088479a78d23403f4a72447ec7f1ba279d7e203500b912c8617973b890c3a07740acacc1ca0e05aabce37bdb33256dd476efc8df14e4db193772ba27827c6fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808303749b8203e880a03062a2d36d2dffed0d1f599ab048b03f80c992dc4c09e6485a06d878583d9e7588503b367f63a3b93ff882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca0bb22121b14802c00aeeab58c784574b6652de624f70befd384c8987e2c0a55cca0490a5791b2d0a8802ce93ed2895089d8834e4c382ad7ed32e0ab6bf1e0c8f291c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec3a382c62ea7fa0d3aeec938ee49b9158e14eb0d761b69166a8d41c148e6cf0a0776f088479a78d23403f4a72447ec7f1ba279d7e203500b912c8617973b890c3a07740acacc1ca0e05aabce37bdb33256dd476efc8df14e4db193772ba27827c6fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808303749b8203e880a043eb9e046910e85f235cd11803f48e189e180b2087349fd285582c67474aeebb88bd5723155724dc8df882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca0bb22121b14802c00aeeab58c784574b6652de624f70befd384c8987e2c0a55cca0490a5791b2d0a8802ce93ed2895089d8834e4c382ad7ed32e0ab6bf1e0c8f291c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -677,8 +896,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xceff443485a8ed701f17be0e1467b0034e1de2e974acdb5226d7409b702302bb",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8ae3fc58844c94861871de3009842dbc7011a06bab68374a4388e41556662c75",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7749b",
@@ -819,10 +1038,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g0v0_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -833,19 +1052,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x021f88",
-                    "hash" : "0xbdf2c0b6577a60cb8912112b7cd2be627c4a7475023a65578b716732db65c836",
-                    "mixHash" : "0x8cc40a53746ea5539b24aa5429942abd0c9efd426b4d3f88346c9164aa801104",
-                    "nonce" : "0x5ab71d6e450c38ca",
+                    "gasUsed" : "0x03749b",
+                    "hash" : "0xa8d245ee67bc719254df967ac6adf66c43c2d2653d3e1439268e297bec626a75",
+                    "mixHash" : "0x46748834f40453f389ed52dabe01111bcb410519e36ebe5bebf9fe062af42d0c",
+                    "nonce" : "0x48e0f98aea862c32",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x73ffc464b3c71b246e079dec87fc3e85ed52fb232d3aa6abfccceadb47864911",
-                    "stateRoot" : "0x04f402d36fab515715e3881610d4429598220617aeecd4f1677e2db5df52f678",
+                    "receiptTrie" : "0x7740acacc1ca0e05aabce37bdb33256dd476efc8df14e4db193772ba27827c6f",
+                    "stateRoot" : "0xec3a382c62ea7fa0d3aeec938ee49b9158e14eb0d761b69166a8d41c148e6cf0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x776f088479a78d23403f4a72447ec7f1ba279d7e203500b912c8617973b890c3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004f402d36fab515715e3881610d4429598220617aeecd4f1677e2db5df52f678a0776f088479a78d23403f4a72447ec7f1ba279d7e203500b912c8617973b890c3a073ffc464b3c71b246e079dec87fc3e85ed52fb232d3aa6abfccceadb47864911b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021f888203e880a08cc40a53746ea5539b24aa5429942abd0c9efd426b4d3f88346c9164aa801104885ab71d6e450c38caf882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca0bb22121b14802c00aeeab58c784574b6652de624f70befd384c8987e2c0a55cca0490a5791b2d0a8802ce93ed2895089d8834e4c382ad7ed32e0ab6bf1e0c8f291c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec3a382c62ea7fa0d3aeec938ee49b9158e14eb0d761b69166a8d41c148e6cf0a0776f088479a78d23403f4a72447ec7f1ba279d7e203500b912c8617973b890c3a07740acacc1ca0e05aabce37bdb33256dd476efc8df14e4db193772ba27827c6fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808303749b8203e880a046748834f40453f389ed52dabe01111bcb410519e36ebe5bebf9fe062af42d0c8848e0f98aea862c32f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca0bb22121b14802c00aeeab58c784574b6652de624f70befd384c8987e2c0a55cca0490a5791b2d0a8802ce93ed2895089d8834e4c382ad7ed32e0ab6bf1e0c8f291c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -882,18 +1101,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbdf2c0b6577a60cb8912112b7cd2be627c4a7475023a65578b716732db65c836",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xa8d245ee67bc719254df967ac6adf66c43c2d2653d3e1439268e297bec626a75",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f61f88",
+                "balance" : "0x4563918244f7749b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -930,7 +1142,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2f078",
+                "balance" : "0xe8d4a19b65",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g0v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g0v1.json
index ccfe4d45f..0141f3163 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g0v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g0v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d0g0v1_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d0g0v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x039917",
-                    "hash" : "0xe6543a916966cbae8ca43b29c6040c40eb7cd4034ff8ddc1c4052b42faed70a3",
-                    "mixHash" : "0xfca08b5536c742f8079c2241e7b261dde254d0114f9b4de797ae3a20ff7df00d",
-                    "nonce" : "0xd7a491f0563f0572",
+                    "gasUsed" : "0x0239b4",
+                    "hash" : "0x922613f9c3daf630ac9d9e2e08a72885edfc23d6356653d24ba6ab6b13a0f7b4",
+                    "mixHash" : "0xdd092a0c9caf55e7ae40046b8633d943bcd2fc88d4bb61e90201a2563285d146",
+                    "nonce" : "0x428a67403a141786",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xfd2daf41f78af65ced5d3d6f04c8bf652224da43492c043ebfa2d49e04c10649",
-                    "stateRoot" : "0x64325d9bd350ad661c35a501a1cb275f67780f4d95e89e21c89904802835d434",
+                    "receiptTrie" : "0x2c8982f9884df66f5bff5b9487b808a3115de89765f000b65f769677eaa677cf",
+                    "stateRoot" : "0xf053e14c382ddd102b251e499e1676e467a97dab33a05192e702ddde4975000d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc114cd3c07b8f4a61cbf1e57e397241dbee562bb8d8dc6c2b3f75b88d3ad2ae6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa064325d9bd350ad661c35a501a1cb275f67780f4d95e89e21c89904802835d434a0c114cd3c07b8f4a61cbf1e57e397241dbee562bb8d8dc6c2b3f75b88d3ad2ae6a0fd2daf41f78af65ced5d3d6f04c8bf652224da43492c043ebfa2d49e04c10649b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830399178203e880a0fca08b5536c742f8079c2241e7b261dde254d0114f9b4de797ae3a20ff7df00d88d7a491f0563f0572f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba08fa291dae10244ff2977d356b020ef3825b73fdb5932150834468eb3163772bfa066c0833441771a9df6c5ee36acef68a158f0a83d90b06da4dd3840c7a14168e1c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f053e14c382ddd102b251e499e1676e467a97dab33a05192e702ddde4975000da0c114cd3c07b8f4a61cbf1e57e397241dbee562bb8d8dc6c2b3f75b88d3ad2ae6a02c8982f9884df66f5bff5b9487b808a3115de89765f000b65f769677eaa677cfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239b48203e880a0dd092a0c9caf55e7ae40046b8633d943bcd2fc88d4bb61e90201a2563285d14688428a67403a141786f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba08fa291dae10244ff2977d356b020ef3825b73fdb5932150834468eb3163772bfa066c0833441771a9df6c5ee36acef68a158f0a83d90b06da4dd3840c7a14168e1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe6543a916966cbae8ca43b29c6040c40eb7cd4034ff8ddc1c4052b42faed70a3",
-        "network" : "EIP150",
+        "lastblockhash" : "0x922613f9c3daf630ac9d9e2e08a72885edfc23d6356653d24ba6ab6b13a0f7b4",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f79917",
+                "balance" : "0x4563918244f639b4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -103,7 +110,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a176df",
+                "balance" : "0xe8d4a2d642",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -204,10 +211,222 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g0v1_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d0g0v1_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g0v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0239b4",
+                    "hash" : "0x835d47a24226ea71a210f49325a6deb6ef54fd538bd47b9a8248aefffc2a384d",
+                    "mixHash" : "0x055fd9115354cb5f156a2f6056b8a5a8b6959dd0275b6aa4868f192fbf701090",
+                    "nonce" : "0x4c8a30d532a9d118",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0x2c8982f9884df66f5bff5b9487b808a3115de89765f000b65f769677eaa677cf",
+                    "stateRoot" : "0xf053e14c382ddd102b251e499e1676e467a97dab33a05192e702ddde4975000d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc114cd3c07b8f4a61cbf1e57e397241dbee562bb8d8dc6c2b3f75b88d3ad2ae6",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f053e14c382ddd102b251e499e1676e467a97dab33a05192e702ddde4975000da0c114cd3c07b8f4a61cbf1e57e397241dbee562bb8d8dc6c2b3f75b88d3ad2ae6a02c8982f9884df66f5bff5b9487b808a3115de89765f000b65f769677eaa677cfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239b48203e880a0055fd9115354cb5f156a2f6056b8a5a8b6959dd0275b6aa4868f192fbf701090884c8a30d532a9d118f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba08fa291dae10244ff2977d356b020ef3825b73fdb5932150834468eb3163772bfa066c0833441771a9df6c5ee36acef68a158f0a83d90b06da4dd3840c7a14168e1c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
+                        "gasLimit" : "0x0c3500",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8fa291dae10244ff2977d356b020ef3825b73fdb5932150834468eb3163772bf",
+                        "s" : "0x66c0833441771a9df6c5ee36acef68a158f0a83d90b06da4dd3840c7a14168e1",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x835d47a24226ea71a210f49325a6deb6ef54fd538bd47b9a8248aefffc2a384d",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f639b4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x0a",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c"
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2d642",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d0g0v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -219,9 +438,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x039917",
-                    "hash" : "0x8fa405cd1eb15345e6e1224639c1949e83d68775b0a711ba6c1f7bd653e9f543",
-                    "mixHash" : "0x253f7eb8879a82a7f43df36333b688a2f1d1f98ff1718dab2a7ac95ed619251d",
-                    "nonce" : "0x96e81239029c1e61",
+                    "hash" : "0xcce8699f8ed8ce0c039367b6da50cf1dd4d41d80c4919f24841ae7fec516489b",
+                    "mixHash" : "0x2a7357a51a05ba5f273bc66f5ff871a993d8ce401bd24eed3103cffbe87d7d91",
+                    "nonce" : "0x43d8b0f3db8ef291",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xfd2daf41f78af65ced5d3d6f04c8bf652224da43492c043ebfa2d49e04c10649",
@@ -230,7 +449,7 @@
                     "transactionsTrie" : "0xc114cd3c07b8f4a61cbf1e57e397241dbee562bb8d8dc6c2b3f75b88d3ad2ae6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa064325d9bd350ad661c35a501a1cb275f67780f4d95e89e21c89904802835d434a0c114cd3c07b8f4a61cbf1e57e397241dbee562bb8d8dc6c2b3f75b88d3ad2ae6a0fd2daf41f78af65ced5d3d6f04c8bf652224da43492c043ebfa2d49e04c10649b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830399178203e880a0253f7eb8879a82a7f43df36333b688a2f1d1f98ff1718dab2a7ac95ed619251d8896e81239029c1e61f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba08fa291dae10244ff2977d356b020ef3825b73fdb5932150834468eb3163772bfa066c0833441771a9df6c5ee36acef68a158f0a83d90b06da4dd3840c7a14168e1c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa064325d9bd350ad661c35a501a1cb275f67780f4d95e89e21c89904802835d434a0c114cd3c07b8f4a61cbf1e57e397241dbee562bb8d8dc6c2b3f75b88d3ad2ae6a0fd2daf41f78af65ced5d3d6f04c8bf652224da43492c043ebfa2d49e04c10649b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830399178203e880a02a7357a51a05ba5f273bc66f5ff871a993d8ce401bd24eed3103cffbe87d7d918843d8b0f3db8ef291f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba08fa291dae10244ff2977d356b020ef3825b73fdb5932150834468eb3163772bfa066c0833441771a9df6c5ee36acef68a158f0a83d90b06da4dd3840c7a14168e1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -267,8 +486,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8fa405cd1eb15345e6e1224639c1949e83d68775b0a711ba6c1f7bd653e9f543",
-        "network" : "EIP158",
+        "lastblockhash" : "0xcce8699f8ed8ce0c039367b6da50cf1dd4d41d80c4919f24841ae7fec516489b",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f79917",
@@ -409,10 +628,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g0v1_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d0g0v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -423,19 +642,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x038ec7",
-                    "hash" : "0xbdbb32bedb27fa4323f5797541be7581585b105cb8742750664e857e67f5eefc",
-                    "mixHash" : "0x3fb5fe62775b4c1153f92a1abbf378df50eabad75805df4c658e02440b4b7502",
-                    "nonce" : "0x98ebc01d9c26e434",
+                    "gasUsed" : "0x039917",
+                    "hash" : "0xc0d2227822fa200c04455c472b4a5bd8fb0ec32ebaa99128d0583dc8f63478bf",
+                    "mixHash" : "0x32eea55e59e83ef720118266e3fc9859171a4393c27cd3b7260aae58ef53d125",
+                    "nonce" : "0x571fae2c5080aabf",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x10bb8081b070f16b820f1a59371ffaffec87a7ddc9ff3f69f4e06797750d9150",
-                    "stateRoot" : "0x6867b82c5aeb1765d7540c82f005376c62d2e0e538121b20e00c13bec6b2b517",
+                    "receiptTrie" : "0xfd2daf41f78af65ced5d3d6f04c8bf652224da43492c043ebfa2d49e04c10649",
+                    "stateRoot" : "0x64325d9bd350ad661c35a501a1cb275f67780f4d95e89e21c89904802835d434",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc114cd3c07b8f4a61cbf1e57e397241dbee562bb8d8dc6c2b3f75b88d3ad2ae6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06867b82c5aeb1765d7540c82f005376c62d2e0e538121b20e00c13bec6b2b517a0c114cd3c07b8f4a61cbf1e57e397241dbee562bb8d8dc6c2b3f75b88d3ad2ae6a010bb8081b070f16b820f1a59371ffaffec87a7ddc9ff3f69f4e06797750d9150b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083038ec78203e880a03fb5fe62775b4c1153f92a1abbf378df50eabad75805df4c658e02440b4b75028898ebc01d9c26e434f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba08fa291dae10244ff2977d356b020ef3825b73fdb5932150834468eb3163772bfa066c0833441771a9df6c5ee36acef68a158f0a83d90b06da4dd3840c7a14168e1c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa064325d9bd350ad661c35a501a1cb275f67780f4d95e89e21c89904802835d434a0c114cd3c07b8f4a61cbf1e57e397241dbee562bb8d8dc6c2b3f75b88d3ad2ae6a0fd2daf41f78af65ced5d3d6f04c8bf652224da43492c043ebfa2d49e04c10649b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830399178203e880a032eea55e59e83ef720118266e3fc9859171a4393c27cd3b7260aae58ef53d12588571fae2c5080aabff882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba08fa291dae10244ff2977d356b020ef3825b73fdb5932150834468eb3163772bfa066c0833441771a9df6c5ee36acef68a158f0a83d90b06da4dd3840c7a14168e1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -472,11 +691,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbdbb32bedb27fa4323f5797541be7581585b105cb8742750664e857e67f5eefc",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc0d2227822fa200c04455c472b4a5bd8fb0ec32ebaa99128d0583dc8f63478bf",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f78ec7",
+                "balance" : "0x4563918244f79917",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -513,7 +732,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a1812f",
+                "balance" : "0xe8d4a176df",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -614,10 +833,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g0v1_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d0g0v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -629,9 +848,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x038ec7",
-                    "hash" : "0xe1f8596d1e6a145ceebfddb39744e777b285bd6648e261974f34cb4b1ea1ad55",
-                    "mixHash" : "0xe9be0df0de2a37110eee6247856bbbf5799618fad1259298298fe2491d4a52bd",
-                    "nonce" : "0xfcc33f53c6bbcd29",
+                    "hash" : "0xa2fa1d27a51df1a431086c5b69a76b25b90d3b7270de4c1220d275fb52bb067f",
+                    "mixHash" : "0x6aa1571de369b3622dd1abaa45b864c4b63bf2637d7d5f31c21ef0a78819e7f0",
+                    "nonce" : "0x9671f50ae1118678",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x10bb8081b070f16b820f1a59371ffaffec87a7ddc9ff3f69f4e06797750d9150",
@@ -640,7 +859,7 @@
                     "transactionsTrie" : "0xc114cd3c07b8f4a61cbf1e57e397241dbee562bb8d8dc6c2b3f75b88d3ad2ae6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06867b82c5aeb1765d7540c82f005376c62d2e0e538121b20e00c13bec6b2b517a0c114cd3c07b8f4a61cbf1e57e397241dbee562bb8d8dc6c2b3f75b88d3ad2ae6a010bb8081b070f16b820f1a59371ffaffec87a7ddc9ff3f69f4e06797750d9150b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083038ec78203e880a0e9be0df0de2a37110eee6247856bbbf5799618fad1259298298fe2491d4a52bd88fcc33f53c6bbcd29f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba08fa291dae10244ff2977d356b020ef3825b73fdb5932150834468eb3163772bfa066c0833441771a9df6c5ee36acef68a158f0a83d90b06da4dd3840c7a14168e1c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06867b82c5aeb1765d7540c82f005376c62d2e0e538121b20e00c13bec6b2b517a0c114cd3c07b8f4a61cbf1e57e397241dbee562bb8d8dc6c2b3f75b88d3ad2ae6a010bb8081b070f16b820f1a59371ffaffec87a7ddc9ff3f69f4e06797750d9150b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083038ec78203e880a06aa1571de369b3622dd1abaa45b864c4b63bf2637d7d5f31c21ef0a78819e7f0889671f50ae1118678f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba08fa291dae10244ff2977d356b020ef3825b73fdb5932150834468eb3163772bfa066c0833441771a9df6c5ee36acef68a158f0a83d90b06da4dd3840c7a14168e1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -677,8 +896,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe1f8596d1e6a145ceebfddb39744e777b285bd6648e261974f34cb4b1ea1ad55",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa2fa1d27a51df1a431086c5b69a76b25b90d3b7270de4c1220d275fb52bb067f",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f78ec7",
@@ -819,10 +1038,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g0v1_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d0g0v1_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -833,19 +1052,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0239b4",
-                    "hash" : "0x1a1332faa241f2bb9efcbcc3814d92031539ec64d2142f7d655b71f79812461a",
-                    "mixHash" : "0xa97affca4ceb945af6b147d28b14291e9453152694535e1d29a5d3893ba921d6",
-                    "nonce" : "0x166a3298473c5c50",
+                    "gasUsed" : "0x038ec7",
+                    "hash" : "0x6b148c44c3afcdb7563ee0d701d68456944d4be5ee7bd9c3071989ccf873751c",
+                    "mixHash" : "0xce007c62a7e2c19610cc64cf38d26df9b55331ef794abeac671017cc4f0bc098",
+                    "nonce" : "0xaf780281ffd8d01b",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x2c8982f9884df66f5bff5b9487b808a3115de89765f000b65f769677eaa677cf",
-                    "stateRoot" : "0xf053e14c382ddd102b251e499e1676e467a97dab33a05192e702ddde4975000d",
+                    "receiptTrie" : "0x10bb8081b070f16b820f1a59371ffaffec87a7ddc9ff3f69f4e06797750d9150",
+                    "stateRoot" : "0x6867b82c5aeb1765d7540c82f005376c62d2e0e538121b20e00c13bec6b2b517",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc114cd3c07b8f4a61cbf1e57e397241dbee562bb8d8dc6c2b3f75b88d3ad2ae6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f053e14c382ddd102b251e499e1676e467a97dab33a05192e702ddde4975000da0c114cd3c07b8f4a61cbf1e57e397241dbee562bb8d8dc6c2b3f75b88d3ad2ae6a02c8982f9884df66f5bff5b9487b808a3115de89765f000b65f769677eaa677cfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239b48203e880a0a97affca4ceb945af6b147d28b14291e9453152694535e1d29a5d3893ba921d688166a3298473c5c50f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba08fa291dae10244ff2977d356b020ef3825b73fdb5932150834468eb3163772bfa066c0833441771a9df6c5ee36acef68a158f0a83d90b06da4dd3840c7a14168e1c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06867b82c5aeb1765d7540c82f005376c62d2e0e538121b20e00c13bec6b2b517a0c114cd3c07b8f4a61cbf1e57e397241dbee562bb8d8dc6c2b3f75b88d3ad2ae6a010bb8081b070f16b820f1a59371ffaffec87a7ddc9ff3f69f4e06797750d9150b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083038ec78203e880a0ce007c62a7e2c19610cc64cf38d26df9b55331ef794abeac671017cc4f0bc09888af780281ffd8d01bf882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba08fa291dae10244ff2977d356b020ef3825b73fdb5932150834468eb3163772bfa066c0833441771a9df6c5ee36acef68a158f0a83d90b06da4dd3840c7a14168e1c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -882,18 +1101,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1a1332faa241f2bb9efcbcc3814d92031539ec64d2142f7d655b71f79812461a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6b148c44c3afcdb7563ee0d701d68456944d4be5ee7bd9c3071989ccf873751c",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f639b4",
+                "balance" : "0x4563918244f78ec7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -930,7 +1142,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2d642",
+                "balance" : "0xe8d4a1812f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g1v0.json
index 226ef4f03..a09c59047 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d0g1v0_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x021bab",
-                    "hash" : "0xb9555c687297508d3e65bc52e3ae53f845c4e1e8be15924f795c9dd1ed5d908e",
-                    "mixHash" : "0xf1659c8a4d5621062d2ff37e80aef95b299c6adcf7a704024d7db3ce7495a1d2",
-                    "nonce" : "0xa1e07ce0451f14f8",
+                    "hash" : "0x411db7d2ee05d8880e06dadd6bfc63947c153c4ae8588360e19ffbbafe93037c",
+                    "mixHash" : "0xa4be5cedb43862b30a9f8add975095e8b6b7aa640d450ed5d9a0f14ce13eafbb",
+                    "nonce" : "0x37beceb90b1928d9",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248",
-                    "stateRoot" : "0xa27bd406ba7bfcfa53658aeb61745209354cfd1bf2e7b109f3d0e505239cf53d",
+                    "receiptTrie" : "0x53676617105e409ad2fa2ca6c10cff34c7e103bb501f2af60fd65b5311754d2c",
+                    "stateRoot" : "0x8964f2826c5f39086e6c7bde2870c0c9ceb501008c4794d50dcea2e485ec7013",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8398f7e4b1978dbd83524750d768cd4486bbd5be745759aa27e22004efff4618",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a27bd406ba7bfcfa53658aeb61745209354cfd1bf2e7b109f3d0e505239cf53da08398f7e4b1978dbd83524750d768cd4486bbd5be745759aa27e22004efff4618a0974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a0f1659c8a4d5621062d2ff37e80aef95b299c6adcf7a704024d7db3ce7495a1d288a1e07ce0451f14f8f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca09d0f9c343d5a898a88dad1abb395f606ea430fe382b577f6c7ef1edd25694172a03aa8ff1141a4d3fe6f78b4250b5f189fcb5b787d66756f24c9b0c2a425457fe5c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08964f2826c5f39086e6c7bde2870c0c9ceb501008c4794d50dcea2e485ec7013a08398f7e4b1978dbd83524750d768cd4486bbd5be745759aa27e22004efff4618a053676617105e409ad2fa2ca6c10cff34c7e103bb501f2af60fd65b5311754d2cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a0a4be5cedb43862b30a9f8add975095e8b6b7aa640d450ed5d9a0f14ce13eafbb8837beceb90b1928d9f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca09d0f9c343d5a898a88dad1abb395f606ea430fe382b577f6c7ef1edd25694172a03aa8ff1141a4d3fe6f78b4250b5f189fcb5b787d66756f24c9b0c2a425457fe5c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb9555c687297508d3e65bc52e3ae53f845c4e1e8be15924f795c9dd1ed5d908e",
-        "network" : "EIP150",
+        "lastblockhash" : "0x411db7d2ee05d8880e06dadd6bfc63947c153c4ae8588360e19ffbbafe93037c",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f61bab",
                 "code" : "",
@@ -202,10 +209,220 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g1v0_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d0g1v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x021bab",
+                    "hash" : "0x9bf38dc0d826fd273613ef08ec4dd8844f6e111181d5f5e30a4e5342a7ce82a0",
+                    "mixHash" : "0xc363691532757a709150383bdb94db2fd47acd73a4c66ca2cf87c4541f12919f",
+                    "nonce" : "0xe14ee564a712b149",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0x53676617105e409ad2fa2ca6c10cff34c7e103bb501f2af60fd65b5311754d2c",
+                    "stateRoot" : "0x8964f2826c5f39086e6c7bde2870c0c9ceb501008c4794d50dcea2e485ec7013",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8398f7e4b1978dbd83524750d768cd4486bbd5be745759aa27e22004efff4618",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08964f2826c5f39086e6c7bde2870c0c9ceb501008c4794d50dcea2e485ec7013a08398f7e4b1978dbd83524750d768cd4486bbd5be745759aa27e22004efff4618a053676617105e409ad2fa2ca6c10cff34c7e103bb501f2af60fd65b5311754d2cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a0c363691532757a709150383bdb94db2fd47acd73a4c66ca2cf87c4541f12919f88e14ee564a712b149f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca09d0f9c343d5a898a88dad1abb395f606ea430fe382b577f6c7ef1edd25694172a03aa8ff1141a4d3fe6f78b4250b5f189fcb5b787d66756f24c9b0c2a425457fe5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
+                        "gasLimit" : "0x0222e0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d0f9c343d5a898a88dad1abb395f606ea430fe382b577f6c7ef1edd25694172",
+                        "s" : "0x3aa8ff1141a4d3fe6f78b4250b5f189fcb5b787d66756f24c9b0c2a425457fe5",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9bf38dc0d826fd273613ef08ec4dd8844f6e111181d5f5e30a4e5342a7ce82a0",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f61bab",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2f455",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -217,9 +434,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x021bab",
-                    "hash" : "0xa42e0e2633a361de4c03f035c3a2ddf3c6875f28b613ec49812f6cf6c295a265",
-                    "mixHash" : "0x3ec1fc7417f04af22666e1efb4ba4bc58d8e173f4f1f02937d9d53d05d47a9c5",
-                    "nonce" : "0x4f997abc8c018edf",
+                    "hash" : "0x65bae47214e564c1d91f508c5382f8d0b934878538bafdca52308931ade8fdc0",
+                    "mixHash" : "0x1d64124cc3a794b87697434caa837b98fc69d9658a67d5f34a2fcae990e18b77",
+                    "nonce" : "0x703ae601a2ad5def",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248",
@@ -228,7 +445,7 @@
                     "transactionsTrie" : "0x8398f7e4b1978dbd83524750d768cd4486bbd5be745759aa27e22004efff4618",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a27bd406ba7bfcfa53658aeb61745209354cfd1bf2e7b109f3d0e505239cf53da08398f7e4b1978dbd83524750d768cd4486bbd5be745759aa27e22004efff4618a0974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a03ec1fc7417f04af22666e1efb4ba4bc58d8e173f4f1f02937d9d53d05d47a9c5884f997abc8c018edff882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca09d0f9c343d5a898a88dad1abb395f606ea430fe382b577f6c7ef1edd25694172a03aa8ff1141a4d3fe6f78b4250b5f189fcb5b787d66756f24c9b0c2a425457fe5c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a27bd406ba7bfcfa53658aeb61745209354cfd1bf2e7b109f3d0e505239cf53da08398f7e4b1978dbd83524750d768cd4486bbd5be745759aa27e22004efff4618a0974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a01d64124cc3a794b87697434caa837b98fc69d9658a67d5f34a2fcae990e18b7788703ae601a2ad5deff882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca09d0f9c343d5a898a88dad1abb395f606ea430fe382b577f6c7ef1edd25694172a03aa8ff1141a4d3fe6f78b4250b5f189fcb5b787d66756f24c9b0c2a425457fe5c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -265,8 +482,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa42e0e2633a361de4c03f035c3a2ddf3c6875f28b613ec49812f6cf6c295a265",
-        "network" : "EIP158",
+        "lastblockhash" : "0x65bae47214e564c1d91f508c5382f8d0b934878538bafdca52308931ade8fdc0",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f61bab",
@@ -405,10 +622,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g1v0_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -419,19 +636,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0222e0",
-                    "hash" : "0x364e86cf8cae10debf9e68767031f734215a660739c444b97cc5530729e75635",
-                    "mixHash" : "0xc81f8f49117f55f6adf4fcc3b5ed92369f88e167ee82caa5bcf1976d1ca040e0",
-                    "nonce" : "0x0562acfe5b3823d2",
+                    "gasUsed" : "0x021bab",
+                    "hash" : "0x9f21bb387cecd05d9eb8e340fa414ddc8a985af582d111ec7ad92778d5b07c07",
+                    "mixHash" : "0x27295371e0c2ebdde227e03b2760b5b7139067887e2ee7a7bef96666c7af8755",
+                    "nonce" : "0xc604e9431e04025f",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x4127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705",
-                    "stateRoot" : "0x4a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474c",
+                    "receiptTrie" : "0x974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248",
+                    "stateRoot" : "0xa27bd406ba7bfcfa53658aeb61745209354cfd1bf2e7b109f3d0e505239cf53d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8398f7e4b1978dbd83524750d768cd4486bbd5be745759aa27e22004efff4618",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca08398f7e4b1978dbd83524750d768cd4486bbd5be745759aa27e22004efff4618a04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a0c81f8f49117f55f6adf4fcc3b5ed92369f88e167ee82caa5bcf1976d1ca040e0880562acfe5b3823d2f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca09d0f9c343d5a898a88dad1abb395f606ea430fe382b577f6c7ef1edd25694172a03aa8ff1141a4d3fe6f78b4250b5f189fcb5b787d66756f24c9b0c2a425457fe5c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a27bd406ba7bfcfa53658aeb61745209354cfd1bf2e7b109f3d0e505239cf53da08398f7e4b1978dbd83524750d768cd4486bbd5be745759aa27e22004efff4618a0974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a027295371e0c2ebdde227e03b2760b5b7139067887e2ee7a7bef96666c7af875588c604e9431e04025ff882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca09d0f9c343d5a898a88dad1abb395f606ea430fe382b577f6c7ef1edd25694172a03aa8ff1141a4d3fe6f78b4250b5f189fcb5b787d66756f24c9b0c2a425457fe5c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -468,11 +685,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x364e86cf8cae10debf9e68767031f734215a660739c444b97cc5530729e75635",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9f21bb387cecd05d9eb8e340fa414ddc8a985af582d111ec7ad92778d5b07c07",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f622e0",
+                "balance" : "0x4563918244f61bab",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,7 +724,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2ed20",
+                "balance" : "0xe8d4a2f455",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -608,10 +825,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g1v0_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -623,9 +840,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0222e0",
-                    "hash" : "0xc1d68b5081caa4e8909f056b2041318bd49e646d1ea5fcb7e1b009846ecf178b",
-                    "mixHash" : "0xf3af18cc8db4869a7472bb99b197186843c5ae87ed838cc16be3c4ea0a13cb79",
-                    "nonce" : "0x6e7f2045ae058505",
+                    "hash" : "0xf8573cf23775de65a5fb68366dbea045ae76ffe873c1446808d380db7f640854",
+                    "mixHash" : "0xdecd825b0f9f89d289030b65e848afa43cb9c38c9cbf4022e9b88fd966500712",
+                    "nonce" : "0x4cc847bdace24fc4",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x4127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705",
@@ -634,7 +851,7 @@
                     "transactionsTrie" : "0x8398f7e4b1978dbd83524750d768cd4486bbd5be745759aa27e22004efff4618",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca08398f7e4b1978dbd83524750d768cd4486bbd5be745759aa27e22004efff4618a04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a0f3af18cc8db4869a7472bb99b197186843c5ae87ed838cc16be3c4ea0a13cb79886e7f2045ae058505f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca09d0f9c343d5a898a88dad1abb395f606ea430fe382b577f6c7ef1edd25694172a03aa8ff1141a4d3fe6f78b4250b5f189fcb5b787d66756f24c9b0c2a425457fe5c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca08398f7e4b1978dbd83524750d768cd4486bbd5be745759aa27e22004efff4618a04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a0decd825b0f9f89d289030b65e848afa43cb9c38c9cbf4022e9b88fd966500712884cc847bdace24fc4f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca09d0f9c343d5a898a88dad1abb395f606ea430fe382b577f6c7ef1edd25694172a03aa8ff1141a4d3fe6f78b4250b5f189fcb5b787d66756f24c9b0c2a425457fe5c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -671,8 +888,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc1d68b5081caa4e8909f056b2041318bd49e646d1ea5fcb7e1b009846ecf178b",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf8573cf23775de65a5fb68366dbea045ae76ffe873c1446808d380db7f640854",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f622e0",
@@ -811,10 +1028,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g1v0_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -825,19 +1042,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x021bab",
-                    "hash" : "0x3b69eeac9722ff1596e93a51e3a6b58774acbe8412107f403465eb64845276d9",
-                    "mixHash" : "0x50dc64f9c5b2878b5568573a21358628440f59b36c31ee83cb8a02b72548e0fe",
-                    "nonce" : "0x9a8fd49df6cf30f1",
+                    "gasUsed" : "0x0222e0",
+                    "hash" : "0x7a61c67359d047a71c29453a253fbdc051c0c4ae0034a1498595c043e0a1263b",
+                    "mixHash" : "0xd05c7591c9c4f41f80cd0d256c47f11853e2ef20f351d8b03946b586557a5d23",
+                    "nonce" : "0xb1a57ee13136c89e",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x53676617105e409ad2fa2ca6c10cff34c7e103bb501f2af60fd65b5311754d2c",
-                    "stateRoot" : "0x8964f2826c5f39086e6c7bde2870c0c9ceb501008c4794d50dcea2e485ec7013",
+                    "receiptTrie" : "0x4127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705",
+                    "stateRoot" : "0x4a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8398f7e4b1978dbd83524750d768cd4486bbd5be745759aa27e22004efff4618",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08964f2826c5f39086e6c7bde2870c0c9ceb501008c4794d50dcea2e485ec7013a08398f7e4b1978dbd83524750d768cd4486bbd5be745759aa27e22004efff4618a053676617105e409ad2fa2ca6c10cff34c7e103bb501f2af60fd65b5311754d2cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a050dc64f9c5b2878b5568573a21358628440f59b36c31ee83cb8a02b72548e0fe889a8fd49df6cf30f1f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca09d0f9c343d5a898a88dad1abb395f606ea430fe382b577f6c7ef1edd25694172a03aa8ff1141a4d3fe6f78b4250b5f189fcb5b787d66756f24c9b0c2a425457fe5c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca08398f7e4b1978dbd83524750d768cd4486bbd5be745759aa27e22004efff4618a04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a0d05c7591c9c4f41f80cd0d256c47f11853e2ef20f351d8b03946b586557a5d2388b1a57ee13136c89ef882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca09d0f9c343d5a898a88dad1abb395f606ea430fe382b577f6c7ef1edd25694172a03aa8ff1141a4d3fe6f78b4250b5f189fcb5b787d66756f24c9b0c2a425457fe5c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -874,18 +1091,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3b69eeac9722ff1596e93a51e3a6b58774acbe8412107f403465eb64845276d9",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x7a61c67359d047a71c29453a253fbdc051c0c4ae0034a1498595c043e0a1263b",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f61bab",
+                "balance" : "0x4563918244f622e0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -920,7 +1130,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2f455",
+                "balance" : "0xe8d4a2ed20",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g1v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g1v1.json
index 6cd919f04..d22f6641e 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g1v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g1v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d0g1v1_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d0g1v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x021c38",
-                    "hash" : "0x71beaa4cf13dce29a1d6d3ba84473413dd8ee4513799884778809522f57a33b4",
-                    "mixHash" : "0x77b95696a217ecdc28209330c396a480cb25ae944aac71c90b8ab6fa0b6c6aa3",
-                    "nonce" : "0xdde94b2e5742d182",
+                    "hash" : "0xcca52ea1ca3d78209e4920d0aa58981af0e1646af8ab0cc7e13fe77f6a399842",
+                    "mixHash" : "0xfd362f79f92e88e7da9a317f1962772278c6ef206cd4659a68615b3912d9c746",
+                    "nonce" : "0x58000ca028ef256a",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x4569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347",
-                    "stateRoot" : "0x3c1d230a551485cf88053ae87b45605c9aef43f470d13df126fe6ae8beb5fcb0",
+                    "receiptTrie" : "0x24d2d186ab09293dbc34b96a81c4c5b17ca8ffcaf089fac761837eb4295292ce",
+                    "stateRoot" : "0xce4e66c72c075a0f93843f269406dbe35dcdcc3f047d9739dc77ad2e3500bbfe",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4441c9b67374ba75165edc21a10bcbe1e2aaf9c1c9b988b6258efcbeea51aadd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c1d230a551485cf88053ae87b45605c9aef43f470d13df126fe6ae8beb5fcb0a04441c9b67374ba75165edc21a10bcbe1e2aaf9c1c9b988b6258efcbeea51aadda04569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a077b95696a217ecdc28209330c396a480cb25ae944aac71c90b8ab6fa0b6c6aa388dde94b2e5742d182f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0e0de9a7273e42b117eec98fe2fc16b2391f8f2444ad8be900505cde646debb60a01a94355af38dca5784198b9d4b4c769fb92cbdae1ba22a08f8006dee28317dd2c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ce4e66c72c075a0f93843f269406dbe35dcdcc3f047d9739dc77ad2e3500bbfea04441c9b67374ba75165edc21a10bcbe1e2aaf9c1c9b988b6258efcbeea51aadda024d2d186ab09293dbc34b96a81c4c5b17ca8ffcaf089fac761837eb4295292ceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a0fd362f79f92e88e7da9a317f1962772278c6ef206cd4659a68615b3912d9c7468858000ca028ef256af882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0e0de9a7273e42b117eec98fe2fc16b2391f8f2444ad8be900505cde646debb60a01a94355af38dca5784198b9d4b4c769fb92cbdae1ba22a08f8006dee28317dd2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x71beaa4cf13dce29a1d6d3ba84473413dd8ee4513799884778809522f57a33b4",
-        "network" : "EIP150",
+        "lastblockhash" : "0xcca52ea1ca3d78209e4920d0aa58981af0e1646af8ab0cc7e13fe77f6a399842",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f61c38",
                 "code" : "",
@@ -202,10 +209,220 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g1v1_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d0g1v1_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g1v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x021c38",
+                    "hash" : "0x1b973798d0b4c4472381e36ced2ccec1452e65e6a55aee3e7bd942957f04b025",
+                    "mixHash" : "0x665f010e41dad84975d9097eae23d07578506e7160fab6de28c0db3324c64213",
+                    "nonce" : "0x67f22ea4f3519236",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0x24d2d186ab09293dbc34b96a81c4c5b17ca8ffcaf089fac761837eb4295292ce",
+                    "stateRoot" : "0xce4e66c72c075a0f93843f269406dbe35dcdcc3f047d9739dc77ad2e3500bbfe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4441c9b67374ba75165edc21a10bcbe1e2aaf9c1c9b988b6258efcbeea51aadd",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ce4e66c72c075a0f93843f269406dbe35dcdcc3f047d9739dc77ad2e3500bbfea04441c9b67374ba75165edc21a10bcbe1e2aaf9c1c9b988b6258efcbeea51aadda024d2d186ab09293dbc34b96a81c4c5b17ca8ffcaf089fac761837eb4295292ceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a0665f010e41dad84975d9097eae23d07578506e7160fab6de28c0db3324c642138867f22ea4f3519236f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0e0de9a7273e42b117eec98fe2fc16b2391f8f2444ad8be900505cde646debb60a01a94355af38dca5784198b9d4b4c769fb92cbdae1ba22a08f8006dee28317dd2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
+                        "gasLimit" : "0x0222e0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe0de9a7273e42b117eec98fe2fc16b2391f8f2444ad8be900505cde646debb60",
+                        "s" : "0x1a94355af38dca5784198b9d4b4c769fb92cbdae1ba22a08f8006dee28317dd2",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1b973798d0b4c4472381e36ced2ccec1452e65e6a55aee3e7bd942957f04b025",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f61c38",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2f3be",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x0a",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d0g1v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -217,9 +434,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x021c38",
-                    "hash" : "0x7bf8c13eb7ffb4f8ef55d28edceef1153832294bdeb2970b74b5222d613ca716",
-                    "mixHash" : "0x95abd82fc4e2e24d0ff0ff178ac942495c1725ca2da3ee9aa9330220987def6d",
-                    "nonce" : "0x6b61a2fad2d60566",
+                    "hash" : "0xbb55c8c3e88b5094d9bb7a1f3c2cbf80c202ed6f4addac45bb7836e0b62930c2",
+                    "mixHash" : "0xe3e921bfc6625b9936db42d47e9482b191a3968681ef92fb8da32df8ce4dfc76",
+                    "nonce" : "0xcf5ccea2c2d5187a",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x4569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347",
@@ -228,7 +445,7 @@
                     "transactionsTrie" : "0x4441c9b67374ba75165edc21a10bcbe1e2aaf9c1c9b988b6258efcbeea51aadd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c1d230a551485cf88053ae87b45605c9aef43f470d13df126fe6ae8beb5fcb0a04441c9b67374ba75165edc21a10bcbe1e2aaf9c1c9b988b6258efcbeea51aadda04569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a095abd82fc4e2e24d0ff0ff178ac942495c1725ca2da3ee9aa9330220987def6d886b61a2fad2d60566f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0e0de9a7273e42b117eec98fe2fc16b2391f8f2444ad8be900505cde646debb60a01a94355af38dca5784198b9d4b4c769fb92cbdae1ba22a08f8006dee28317dd2c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c1d230a551485cf88053ae87b45605c9aef43f470d13df126fe6ae8beb5fcb0a04441c9b67374ba75165edc21a10bcbe1e2aaf9c1c9b988b6258efcbeea51aadda04569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a0e3e921bfc6625b9936db42d47e9482b191a3968681ef92fb8da32df8ce4dfc7688cf5ccea2c2d5187af882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0e0de9a7273e42b117eec98fe2fc16b2391f8f2444ad8be900505cde646debb60a01a94355af38dca5784198b9d4b4c769fb92cbdae1ba22a08f8006dee28317dd2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -265,8 +482,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7bf8c13eb7ffb4f8ef55d28edceef1153832294bdeb2970b74b5222d613ca716",
-        "network" : "EIP158",
+        "lastblockhash" : "0xbb55c8c3e88b5094d9bb7a1f3c2cbf80c202ed6f4addac45bb7836e0b62930c2",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f61c38",
@@ -405,10 +622,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g1v1_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d0g1v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -419,19 +636,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0222e0",
-                    "hash" : "0x66ab179bfd474149f9923689787b80261ee99cd9df88ca55f571e337f5b30757",
-                    "mixHash" : "0xc226bc7947d4b401d04509446285afafecfce1b72211cdac1d191ab9cd7ff0a8",
-                    "nonce" : "0x893bf6202fd597f5",
+                    "gasUsed" : "0x021c38",
+                    "hash" : "0x912d0a16f1eb081d60951327e88d0daabf5c0d666d8469125212ae910787ea7e",
+                    "mixHash" : "0x22578e479169fe9b5f8ea435a24ec0d1967148ca6692f3cdbc32a2fca4afa18c",
+                    "nonce" : "0x90a800e899c3aebf",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x4127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705",
-                    "stateRoot" : "0x4a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474c",
+                    "receiptTrie" : "0x4569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347",
+                    "stateRoot" : "0x3c1d230a551485cf88053ae87b45605c9aef43f470d13df126fe6ae8beb5fcb0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4441c9b67374ba75165edc21a10bcbe1e2aaf9c1c9b988b6258efcbeea51aadd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca04441c9b67374ba75165edc21a10bcbe1e2aaf9c1c9b988b6258efcbeea51aadda04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a0c226bc7947d4b401d04509446285afafecfce1b72211cdac1d191ab9cd7ff0a888893bf6202fd597f5f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0e0de9a7273e42b117eec98fe2fc16b2391f8f2444ad8be900505cde646debb60a01a94355af38dca5784198b9d4b4c769fb92cbdae1ba22a08f8006dee28317dd2c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c1d230a551485cf88053ae87b45605c9aef43f470d13df126fe6ae8beb5fcb0a04441c9b67374ba75165edc21a10bcbe1e2aaf9c1c9b988b6258efcbeea51aadda04569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a022578e479169fe9b5f8ea435a24ec0d1967148ca6692f3cdbc32a2fca4afa18c8890a800e899c3aebff882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0e0de9a7273e42b117eec98fe2fc16b2391f8f2444ad8be900505cde646debb60a01a94355af38dca5784198b9d4b4c769fb92cbdae1ba22a08f8006dee28317dd2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -468,11 +685,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x66ab179bfd474149f9923689787b80261ee99cd9df88ca55f571e337f5b30757",
-        "network" : "Frontier",
+        "lastblockhash" : "0x912d0a16f1eb081d60951327e88d0daabf5c0d666d8469125212ae910787ea7e",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f622e0",
+                "balance" : "0x4563918244f61c38",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,14 +724,14 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2ed20",
+                "balance" : "0xe8d4a2f3be",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
-                "balance" : "0x00",
+                "balance" : "0x0a",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
@@ -608,10 +825,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g1v1_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d0g1v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -623,9 +840,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0222e0",
-                    "hash" : "0x8c481c5739ddaff0c9ecb8e33df5b65c891f33d38e7487bd86299091e0e5e80b",
-                    "mixHash" : "0x63f5b591de0cb1341c5cbe5074c59576e8d7a40247c7b159ba1562c1dffb49d3",
-                    "nonce" : "0xef9c5ccbe2d62c3e",
+                    "hash" : "0xa0851b845a87a88d9e23d6fbaf5e25e00e6a166f7c62d319bfda95dce783f9ed",
+                    "mixHash" : "0xf8bd1ac6202cac6c8bc0f6dfe06b66a617e72bee2c52c0d724a5797c38418728",
+                    "nonce" : "0x7352c9325bae6d63",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x4127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705",
@@ -634,7 +851,7 @@
                     "transactionsTrie" : "0x4441c9b67374ba75165edc21a10bcbe1e2aaf9c1c9b988b6258efcbeea51aadd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca04441c9b67374ba75165edc21a10bcbe1e2aaf9c1c9b988b6258efcbeea51aadda04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a063f5b591de0cb1341c5cbe5074c59576e8d7a40247c7b159ba1562c1dffb49d388ef9c5ccbe2d62c3ef882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0e0de9a7273e42b117eec98fe2fc16b2391f8f2444ad8be900505cde646debb60a01a94355af38dca5784198b9d4b4c769fb92cbdae1ba22a08f8006dee28317dd2c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca04441c9b67374ba75165edc21a10bcbe1e2aaf9c1c9b988b6258efcbeea51aadda04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a0f8bd1ac6202cac6c8bc0f6dfe06b66a617e72bee2c52c0d724a5797c38418728887352c9325bae6d63f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0e0de9a7273e42b117eec98fe2fc16b2391f8f2444ad8be900505cde646debb60a01a94355af38dca5784198b9d4b4c769fb92cbdae1ba22a08f8006dee28317dd2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -671,8 +888,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8c481c5739ddaff0c9ecb8e33df5b65c891f33d38e7487bd86299091e0e5e80b",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa0851b845a87a88d9e23d6fbaf5e25e00e6a166f7c62d319bfda95dce783f9ed",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f622e0",
@@ -811,10 +1028,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g1v1_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d0g1v1_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -825,19 +1042,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x021c38",
-                    "hash" : "0x427e33a41c706fcc33d275bdf31158e077bd19029fb9e00cfc285108995cf36a",
-                    "mixHash" : "0x744c810bea959a19fee63944195ce2ac1f30b84cb98ebbddb903cdd35266d3fd",
-                    "nonce" : "0x6b2a9b3e1ee7204d",
+                    "gasUsed" : "0x0222e0",
+                    "hash" : "0x3610de9b7b71b949a4411bef89f3222c8c04757ee21c9791afaf915e2f071ff5",
+                    "mixHash" : "0x894e72e4af422483056ace271db6e219bfe0f9d6350eec92a3bca479cd970d7c",
+                    "nonce" : "0xf19ee75269f762c2",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x24d2d186ab09293dbc34b96a81c4c5b17ca8ffcaf089fac761837eb4295292ce",
-                    "stateRoot" : "0xce4e66c72c075a0f93843f269406dbe35dcdcc3f047d9739dc77ad2e3500bbfe",
+                    "receiptTrie" : "0x4127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705",
+                    "stateRoot" : "0x4a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4441c9b67374ba75165edc21a10bcbe1e2aaf9c1c9b988b6258efcbeea51aadd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ce4e66c72c075a0f93843f269406dbe35dcdcc3f047d9739dc77ad2e3500bbfea04441c9b67374ba75165edc21a10bcbe1e2aaf9c1c9b988b6258efcbeea51aadda024d2d186ab09293dbc34b96a81c4c5b17ca8ffcaf089fac761837eb4295292ceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a0744c810bea959a19fee63944195ce2ac1f30b84cb98ebbddb903cdd35266d3fd886b2a9b3e1ee7204df882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0e0de9a7273e42b117eec98fe2fc16b2391f8f2444ad8be900505cde646debb60a01a94355af38dca5784198b9d4b4c769fb92cbdae1ba22a08f8006dee28317dd2c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca04441c9b67374ba75165edc21a10bcbe1e2aaf9c1c9b988b6258efcbeea51aadda04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a0894e72e4af422483056ace271db6e219bfe0f9d6350eec92a3bca479cd970d7c88f19ee75269f762c2f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0e0de9a7273e42b117eec98fe2fc16b2391f8f2444ad8be900505cde646debb60a01a94355af38dca5784198b9d4b4c769fb92cbdae1ba22a08f8006dee28317dd2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -874,18 +1091,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x427e33a41c706fcc33d275bdf31158e077bd19029fb9e00cfc285108995cf36a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x3610de9b7b71b949a4411bef89f3222c8c04757ee21c9791afaf915e2f071ff5",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f61c38",
+                "balance" : "0x4563918244f622e0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -920,14 +1130,14 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2f3be",
+                "balance" : "0xe8d4a2ed20",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
-                "balance" : "0x0a",
+                "balance" : "0x00",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g2v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g2v0.json
index 8f08d251f..d4a1752b4 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g2v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d0g2v0_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d0g2v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g2v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x026893",
-                    "hash" : "0x4f88fea89f3cf513876043b67c6e7572e9bc806b430256bdd89a4f72a8d20371",
-                    "mixHash" : "0x7985527d6f24e0e6f5ce5d10e24f9a78f47ec2c33f4ed585bf16011f5c706637",
-                    "nonce" : "0xf2f5cc6dc6524561",
+                    "gasUsed" : "0x021f88",
+                    "hash" : "0x42728b61d4e3b95be56cd35cf4ef88777e0d89e3552ce38efad6afc3ca319db5",
+                    "mixHash" : "0x7bdbf7a3db2f73a891b3d046a5ee7dd8e7e267730d42ac62a1811b055c069da3",
+                    "nonce" : "0xb06f0194023743a0",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xfaa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bc",
-                    "stateRoot" : "0x1c7205499c9374238b01f9165469bffa499f1e737f29ea24b7db2a6602e0618b",
+                    "receiptTrie" : "0x73ffc464b3c71b246e079dec87fc3e85ed52fb232d3aa6abfccceadb47864911",
+                    "stateRoot" : "0x04f402d36fab515715e3881610d4429598220617aeecd4f1677e2db5df52f678",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d322575d57e21565ba734cb8333cc27e8561d7d2d039daff2be6b10cae6aa17",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c7205499c9374238b01f9165469bffa499f1e737f29ea24b7db2a6602e0618ba06d322575d57e21565ba734cb8333cc27e8561d7d2d039daff2be6b10cae6aa17a0faa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bcb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830268938203e880a07985527d6f24e0e6f5ce5d10e24f9a78f47ec2c33f4ed585bf16011f5c70663788f2f5cc6dc6524561f882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca0c32ccc13e77fc3c4a3b9089592537d76f22426513b1abed87c15429d86dcaf84a006a90555521b3bea2590fd9d2e5f3aaefb41b2e40f2a3912cca6b4239732fd7bc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004f402d36fab515715e3881610d4429598220617aeecd4f1677e2db5df52f678a06d322575d57e21565ba734cb8333cc27e8561d7d2d039daff2be6b10cae6aa17a073ffc464b3c71b246e079dec87fc3e85ed52fb232d3aa6abfccceadb47864911b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021f888203e880a07bdbf7a3db2f73a891b3d046a5ee7dd8e7e267730d42ac62a1811b055c069da388b06f0194023743a0f882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca0c32ccc13e77fc3c4a3b9089592537d76f22426513b1abed87c15429d86dcaf84a006a90555521b3bea2590fd9d2e5f3aaefb41b2e40f2a3912cca6b4239732fd7bc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4f88fea89f3cf513876043b67c6e7572e9bc806b430256bdd89a4f72a8d20371",
-        "network" : "EIP150",
+        "lastblockhash" : "0x42728b61d4e3b95be56cd35cf4ef88777e0d89e3552ce38efad6afc3ca319db5",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f66893",
+                "balance" : "0x4563918244f61f88",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -77,6 +84,8 @@
                 "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c"
                 }
             },
             "0xa100000000000000000000000000000000000000" : {
@@ -101,7 +110,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2a76d",
+                "balance" : "0xe8d4a2f078",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -202,10 +211,222 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g2v0_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d0g2v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g2v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x021f88",
+                    "hash" : "0xbb1cdb3fdb7b39c702710104c6fac4b774691fedab2487a247308bb3a07bba91",
+                    "mixHash" : "0x53ba436521545da5d5c300ad936b3cb7b0c075338512571ae36ac97ad7b9764b",
+                    "nonce" : "0xdb9396b024fc7e6d",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0x73ffc464b3c71b246e079dec87fc3e85ed52fb232d3aa6abfccceadb47864911",
+                    "stateRoot" : "0x04f402d36fab515715e3881610d4429598220617aeecd4f1677e2db5df52f678",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6d322575d57e21565ba734cb8333cc27e8561d7d2d039daff2be6b10cae6aa17",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004f402d36fab515715e3881610d4429598220617aeecd4f1677e2db5df52f678a06d322575d57e21565ba734cb8333cc27e8561d7d2d039daff2be6b10cae6aa17a073ffc464b3c71b246e079dec87fc3e85ed52fb232d3aa6abfccceadb47864911b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021f888203e880a053ba436521545da5d5c300ad936b3cb7b0c075338512571ae36ac97ad7b9764b88db9396b024fc7e6df882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca0c32ccc13e77fc3c4a3b9089592537d76f22426513b1abed87c15429d86dcaf84a006a90555521b3bea2590fd9d2e5f3aaefb41b2e40f2a3912cca6b4239732fd7bc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
+                        "gasLimit" : "0x027100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc32ccc13e77fc3c4a3b9089592537d76f22426513b1abed87c15429d86dcaf84",
+                        "s" : "0x06a90555521b3bea2590fd9d2e5f3aaefb41b2e40f2a3912cca6b4239732fd7b",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbb1cdb3fdb7b39c702710104c6fac4b774691fedab2487a247308bb3a07bba91",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f61f88",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c"
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2f078",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d0g2v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g2v0Filler.json"
         },
         "blocks" : [
@@ -217,9 +438,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x026893",
-                    "hash" : "0x4aa09f621590f9515544238bf232d359dc890608a5fa10460a207412d5d3e385",
-                    "mixHash" : "0x79f580ea091071daa29e163d75021d7d42402a79cb9972e8a43a085c672341d6",
-                    "nonce" : "0x0a36c82d84aecc7e",
+                    "hash" : "0x3aff45e8a45b4777028a99025b98823c99b4d8ba524ef9bcf3c57ef735e9b5b9",
+                    "mixHash" : "0x9a517855c2ce5bd3d6c408820069cc7f119386b8fd1cdb1640d59af0df637972",
+                    "nonce" : "0x96e50eccb700f87a",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xfaa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bc",
@@ -228,7 +449,7 @@
                     "transactionsTrie" : "0x6d322575d57e21565ba734cb8333cc27e8561d7d2d039daff2be6b10cae6aa17",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c7205499c9374238b01f9165469bffa499f1e737f29ea24b7db2a6602e0618ba06d322575d57e21565ba734cb8333cc27e8561d7d2d039daff2be6b10cae6aa17a0faa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bcb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830268938203e880a079f580ea091071daa29e163d75021d7d42402a79cb9972e8a43a085c672341d6880a36c82d84aecc7ef882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca0c32ccc13e77fc3c4a3b9089592537d76f22426513b1abed87c15429d86dcaf84a006a90555521b3bea2590fd9d2e5f3aaefb41b2e40f2a3912cca6b4239732fd7bc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c7205499c9374238b01f9165469bffa499f1e737f29ea24b7db2a6602e0618ba06d322575d57e21565ba734cb8333cc27e8561d7d2d039daff2be6b10cae6aa17a0faa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bcb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830268938203e880a09a517855c2ce5bd3d6c408820069cc7f119386b8fd1cdb1640d59af0df6379728896e50eccb700f87af882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca0c32ccc13e77fc3c4a3b9089592537d76f22426513b1abed87c15429d86dcaf84a006a90555521b3bea2590fd9d2e5f3aaefb41b2e40f2a3912cca6b4239732fd7bc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -265,8 +486,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4aa09f621590f9515544238bf232d359dc890608a5fa10460a207412d5d3e385",
-        "network" : "EIP158",
+        "lastblockhash" : "0x3aff45e8a45b4777028a99025b98823c99b4d8ba524ef9bcf3c57ef735e9b5b9",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f66893",
@@ -405,10 +626,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g2v0_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d0g2v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g2v0Filler.json"
         },
         "blocks" : [
@@ -419,19 +640,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x027100",
-                    "hash" : "0x7565d6690d625b512cde81602b34704a0c04b5b956a68e1f3d880c4704cb499a",
-                    "mixHash" : "0xa4399dcc1d5669f474e2872ead7a3d335662871946982a0dc29a0fa18b23f2f9",
-                    "nonce" : "0xae4bee3ef52b6cd1",
+                    "gasUsed" : "0x026893",
+                    "hash" : "0xd8162cead01561a43c412346bea443b0216d0dbb0191be023cd301f33c640b9e",
+                    "mixHash" : "0x5dcbc63bc2f9a752ce8a77dd05973ede3ba68e6409e430f103e8d7ea93250c64",
+                    "nonce" : "0x0d686f70e6bba48d",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
-                    "stateRoot" : "0x73f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26e",
+                    "receiptTrie" : "0xfaa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bc",
+                    "stateRoot" : "0x1c7205499c9374238b01f9165469bffa499f1e737f29ea24b7db2a6602e0618b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d322575d57e21565ba734cb8333cc27e8561d7d2d039daff2be6b10cae6aa17",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea06d322575d57e21565ba734cb8333cc27e8561d7d2d039daff2be6b10cae6aa17a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0a4399dcc1d5669f474e2872ead7a3d335662871946982a0dc29a0fa18b23f2f988ae4bee3ef52b6cd1f882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca0c32ccc13e77fc3c4a3b9089592537d76f22426513b1abed87c15429d86dcaf84a006a90555521b3bea2590fd9d2e5f3aaefb41b2e40f2a3912cca6b4239732fd7bc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c7205499c9374238b01f9165469bffa499f1e737f29ea24b7db2a6602e0618ba06d322575d57e21565ba734cb8333cc27e8561d7d2d039daff2be6b10cae6aa17a0faa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bcb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830268938203e880a05dcbc63bc2f9a752ce8a77dd05973ede3ba68e6409e430f103e8d7ea93250c64880d686f70e6bba48df882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca0c32ccc13e77fc3c4a3b9089592537d76f22426513b1abed87c15429d86dcaf84a006a90555521b3bea2590fd9d2e5f3aaefb41b2e40f2a3912cca6b4239732fd7bc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -468,11 +689,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7565d6690d625b512cde81602b34704a0c04b5b956a68e1f3d880c4704cb499a",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd8162cead01561a43c412346bea443b0216d0dbb0191be023cd301f33c640b9e",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f67100",
+                "balance" : "0x4563918244f66893",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,7 +728,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a29f00",
+                "balance" : "0xe8d4a2a76d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -608,10 +829,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g2v0_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d0g2v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g2v0Filler.json"
         },
         "blocks" : [
@@ -623,9 +844,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0x4d830e376009e82a8cdb5d67f209bfd38faf375df6bb86472f35905fa7803d58",
-                    "mixHash" : "0x3f4135d87951f7b983a34227534092d8f743fe86bc490aa9fa232350c37839b3",
-                    "nonce" : "0xedf51556f3ba202f",
+                    "hash" : "0x385cb6ad2f93eafb0831288d6ac28fc12593dfe841808b3ba96393cc2be65288",
+                    "mixHash" : "0x9da3e2884a81c26b59eade3d9faff52fc4e4a5ccb238b5dd81a178183ce88de9",
+                    "nonce" : "0xbb5c4d1de635976e",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
@@ -634,7 +855,7 @@
                     "transactionsTrie" : "0x6d322575d57e21565ba734cb8333cc27e8561d7d2d039daff2be6b10cae6aa17",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea06d322575d57e21565ba734cb8333cc27e8561d7d2d039daff2be6b10cae6aa17a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a03f4135d87951f7b983a34227534092d8f743fe86bc490aa9fa232350c37839b388edf51556f3ba202ff882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca0c32ccc13e77fc3c4a3b9089592537d76f22426513b1abed87c15429d86dcaf84a006a90555521b3bea2590fd9d2e5f3aaefb41b2e40f2a3912cca6b4239732fd7bc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea06d322575d57e21565ba734cb8333cc27e8561d7d2d039daff2be6b10cae6aa17a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a09da3e2884a81c26b59eade3d9faff52fc4e4a5ccb238b5dd81a178183ce88de988bb5c4d1de635976ef882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca0c32ccc13e77fc3c4a3b9089592537d76f22426513b1abed87c15429d86dcaf84a006a90555521b3bea2590fd9d2e5f3aaefb41b2e40f2a3912cca6b4239732fd7bc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -671,8 +892,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4d830e376009e82a8cdb5d67f209bfd38faf375df6bb86472f35905fa7803d58",
-        "network" : "Homestead",
+        "lastblockhash" : "0x385cb6ad2f93eafb0831288d6ac28fc12593dfe841808b3ba96393cc2be65288",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f67100",
@@ -811,10 +1032,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g2v0_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d0g2v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g2v0Filler.json"
         },
         "blocks" : [
@@ -825,19 +1046,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x021f88",
-                    "hash" : "0x23f4fcbc4e57a3f6c31c5e39994b7872857627f3a4e18b9088b9d0c52a39b221",
-                    "mixHash" : "0x2775280089774c1a9d1d270137d2024321e293d793f256cf2d9dc29d2bde68f6",
-                    "nonce" : "0x44c9be0e94c06da3",
+                    "gasUsed" : "0x027100",
+                    "hash" : "0x4bfdf9c56c0051804c4695f7e540203bb48e10b41a6241f1c7ff1080c6ec8b64",
+                    "mixHash" : "0x96de84a260a8723a5274d27bac55d534c5c929a94178daf619f891a954000ee1",
+                    "nonce" : "0x3bafc37944df09bf",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x73ffc464b3c71b246e079dec87fc3e85ed52fb232d3aa6abfccceadb47864911",
-                    "stateRoot" : "0x04f402d36fab515715e3881610d4429598220617aeecd4f1677e2db5df52f678",
+                    "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
+                    "stateRoot" : "0x73f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6d322575d57e21565ba734cb8333cc27e8561d7d2d039daff2be6b10cae6aa17",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004f402d36fab515715e3881610d4429598220617aeecd4f1677e2db5df52f678a06d322575d57e21565ba734cb8333cc27e8561d7d2d039daff2be6b10cae6aa17a073ffc464b3c71b246e079dec87fc3e85ed52fb232d3aa6abfccceadb47864911b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021f888203e880a02775280089774c1a9d1d270137d2024321e293d793f256cf2d9dc29d2bde68f68844c9be0e94c06da3f882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca0c32ccc13e77fc3c4a3b9089592537d76f22426513b1abed87c15429d86dcaf84a006a90555521b3bea2590fd9d2e5f3aaefb41b2e40f2a3912cca6b4239732fd7bc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea06d322575d57e21565ba734cb8333cc27e8561d7d2d039daff2be6b10cae6aa17a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a096de84a260a8723a5274d27bac55d534c5c929a94178daf619f891a954000ee1883bafc37944df09bff882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ca0c32ccc13e77fc3c4a3b9089592537d76f22426513b1abed87c15429d86dcaf84a006a90555521b3bea2590fd9d2e5f3aaefb41b2e40f2a3912cca6b4239732fd7bc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -874,18 +1095,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x23f4fcbc4e57a3f6c31c5e39994b7872857627f3a4e18b9088b9d0c52a39b221",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4bfdf9c56c0051804c4695f7e540203bb48e10b41a6241f1c7ff1080c6ec8b64",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f61f88",
+                "balance" : "0x4563918244f67100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -896,8 +1110,6 @@
                 "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x04" : "0x0c",
-                    "0x05" : "0x0c"
                 }
             },
             "0xa100000000000000000000000000000000000000" : {
@@ -922,7 +1134,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2f078",
+                "balance" : "0xe8d4a29f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g2v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g2v1.json
index 663a106a5..375913ca7 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g2v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g2v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d0g2v1_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d0g2v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g2v1Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x026920",
-                    "hash" : "0xfd10d1171221214e192104c5c24a1a2b3cc63f89f9da72ab63316c43c1050d1e",
-                    "mixHash" : "0xa45c6e88ca6a8a16f6fdaf9e3ee322d4552ab25696e9c4619b24414af4a5bc44",
-                    "nonce" : "0x393bb1c6866298ee",
+                    "gasUsed" : "0x0239b4",
+                    "hash" : "0x15fc5d240634b83c3a9863e600bc6a8fd8820b0d1b89e95b0b08d5d2ea6e3160",
+                    "mixHash" : "0x3ef91e5ce70705b00729eeab61ca4aa56d0fdc79153cfbbafe601f160493deff",
+                    "nonce" : "0x94729d0cf304af43",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0c",
-                    "stateRoot" : "0xc1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750af",
+                    "receiptTrie" : "0x2c8982f9884df66f5bff5b9487b808a3115de89765f000b65f769677eaa677cf",
+                    "stateRoot" : "0xf053e14c382ddd102b251e499e1676e467a97dab33a05192e702ddde4975000d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xccf3d8ee7d2a6f8a893fa9dc4b9aef3edefff03c065223437e329313494f2d72",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750afa0ccf3d8ee7d2a6f8a893fa9dc4b9aef3edefff03c065223437e329313494f2d72a0ab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830269208203e880a0a45c6e88ca6a8a16f6fdaf9e3ee322d4552ab25696e9c4619b24414af4a5bc4488393bb1c6866298eef882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0489e3b85b77513812fb465d6aa1859a6e2696587be8c2232a8f4179c49097d17a078f3d105c5d901853811a363507c4b9e9302064cabb872cf07e4e4437ef3e45ac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f053e14c382ddd102b251e499e1676e467a97dab33a05192e702ddde4975000da0ccf3d8ee7d2a6f8a893fa9dc4b9aef3edefff03c065223437e329313494f2d72a02c8982f9884df66f5bff5b9487b808a3115de89765f000b65f769677eaa677cfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239b48203e880a03ef91e5ce70705b00729eeab61ca4aa56d0fdc79153cfbbafe601f160493deff8894729d0cf304af43f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0489e3b85b77513812fb465d6aa1859a6e2696587be8c2232a8f4179c49097d17a078f3d105c5d901853811a363507c4b9e9302064cabb872cf07e4e4437ef3e45ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -62,21 +62,30 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfd10d1171221214e192104c5c24a1a2b3cc63f89f9da72ab63316c43c1050d1e",
-        "network" : "EIP150",
+        "lastblockhash" : "0x15fc5d240634b83c3a9863e600bc6a8fd8820b0d1b89e95b0b08d5d2ea6e3160",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f66920",
+                "balance" : "0x4563918244f639b4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa000000000000000000000000000000000000000" : {
-                "balance" : "0x00",
+                "balance" : "0x0a",
                 "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c"
                 }
             },
             "0xa100000000000000000000000000000000000000" : {
@@ -101,14 +110,226 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2a6d6",
+                "balance" : "0xe8d4a2d642",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d0g2v1_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g2v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0239b4",
+                    "hash" : "0x9d72eb5bf98ef90b7b06e66691b041f2543917ebd2e6e720b48337c0e734948c",
+                    "mixHash" : "0x8a169ac615c12570686f1f394e2df9e5bbcf001096714b6fd83f05fcec3dd7e1",
+                    "nonce" : "0x69f8b517df8697ee",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0x2c8982f9884df66f5bff5b9487b808a3115de89765f000b65f769677eaa677cf",
+                    "stateRoot" : "0xf053e14c382ddd102b251e499e1676e467a97dab33a05192e702ddde4975000d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xccf3d8ee7d2a6f8a893fa9dc4b9aef3edefff03c065223437e329313494f2d72",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f053e14c382ddd102b251e499e1676e467a97dab33a05192e702ddde4975000da0ccf3d8ee7d2a6f8a893fa9dc4b9aef3edefff03c065223437e329313494f2d72a02c8982f9884df66f5bff5b9487b808a3115de89765f000b65f769677eaa677cfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239b48203e880a08a169ac615c12570686f1f394e2df9e5bbcf001096714b6fd83f05fcec3dd7e18869f8b517df8697eef882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0489e3b85b77513812fb465d6aa1859a6e2696587be8c2232a8f4179c49097d17a078f3d105c5d901853811a363507c4b9e9302064cabb872cf07e4e4437ef3e45ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
+                        "gasLimit" : "0x027100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x489e3b85b77513812fb465d6aa1859a6e2696587be8c2232a8f4179c49097d17",
+                        "s" : "0x78f3d105c5d901853811a363507c4b9e9302064cabb872cf07e4e4437ef3e45a",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9d72eb5bf98ef90b7b06e66691b041f2543917ebd2e6e720b48337c0e734948c",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f639b4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x0a",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c"
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2d642",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
@@ -202,10 +423,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g2v1_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d0g2v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g2v1Filler.json"
         },
         "blocks" : [
@@ -217,9 +438,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x026920",
-                    "hash" : "0x49255c7bcbcaf53c5a69d4e75ac0e8353e4c093b7ca0e0e3737d21ac808acdff",
-                    "mixHash" : "0xf2f3ba75c981f666a9f23c5ce85e2c573c0782ea4936693c246c70e582d207ab",
-                    "nonce" : "0x8671bd2623cbf5e9",
+                    "hash" : "0xac982d5c40bc089ae1a1114bd69f89b07891e7163174ed52ad3b55f227b939dd",
+                    "mixHash" : "0x57845164821e70577c033409c745a2c777992de323e6b5e75d7e89927eb2edac",
+                    "nonce" : "0xf150d194b2452a0e",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0c",
@@ -228,7 +449,7 @@
                     "transactionsTrie" : "0xccf3d8ee7d2a6f8a893fa9dc4b9aef3edefff03c065223437e329313494f2d72",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750afa0ccf3d8ee7d2a6f8a893fa9dc4b9aef3edefff03c065223437e329313494f2d72a0ab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830269208203e880a0f2f3ba75c981f666a9f23c5ce85e2c573c0782ea4936693c246c70e582d207ab888671bd2623cbf5e9f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0489e3b85b77513812fb465d6aa1859a6e2696587be8c2232a8f4179c49097d17a078f3d105c5d901853811a363507c4b9e9302064cabb872cf07e4e4437ef3e45ac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750afa0ccf3d8ee7d2a6f8a893fa9dc4b9aef3edefff03c065223437e329313494f2d72a0ab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830269208203e880a057845164821e70577c033409c745a2c777992de323e6b5e75d7e89927eb2edac88f150d194b2452a0ef882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0489e3b85b77513812fb465d6aa1859a6e2696587be8c2232a8f4179c49097d17a078f3d105c5d901853811a363507c4b9e9302064cabb872cf07e4e4437ef3e45ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -265,8 +486,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x49255c7bcbcaf53c5a69d4e75ac0e8353e4c093b7ca0e0e3737d21ac808acdff",
-        "network" : "EIP158",
+        "lastblockhash" : "0xac982d5c40bc089ae1a1114bd69f89b07891e7163174ed52ad3b55f227b939dd",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f66920",
@@ -405,10 +626,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g2v1_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d0g2v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g2v1Filler.json"
         },
         "blocks" : [
@@ -419,19 +640,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x027100",
-                    "hash" : "0x09ac05f326cb98e08970f368bebf0b0cea0e8f2199efd982a2009fac296ac996",
-                    "mixHash" : "0x26e24b3bc29bc2a5ab1b3125f43f6ce7102f01cc5f229b82e8434265d04f6e3c",
-                    "nonce" : "0x48ff06339af4e2ac",
+                    "gasUsed" : "0x026920",
+                    "hash" : "0xcded80e0e7993f5d533c6bd8d508679330cc50c72467d4dea2efdc7a5a3d1453",
+                    "mixHash" : "0x9d4bed1c42dc3a6e6fc7e12c185aebcfd0c2777c69ffaaeba015ab5c6eeea84d",
+                    "nonce" : "0x8e297352eb1823ae",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
-                    "stateRoot" : "0x73f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26e",
+                    "receiptTrie" : "0xab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0c",
+                    "stateRoot" : "0xc1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750af",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xccf3d8ee7d2a6f8a893fa9dc4b9aef3edefff03c065223437e329313494f2d72",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea0ccf3d8ee7d2a6f8a893fa9dc4b9aef3edefff03c065223437e329313494f2d72a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a026e24b3bc29bc2a5ab1b3125f43f6ce7102f01cc5f229b82e8434265d04f6e3c8848ff06339af4e2acf882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0489e3b85b77513812fb465d6aa1859a6e2696587be8c2232a8f4179c49097d17a078f3d105c5d901853811a363507c4b9e9302064cabb872cf07e4e4437ef3e45ac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750afa0ccf3d8ee7d2a6f8a893fa9dc4b9aef3edefff03c065223437e329313494f2d72a0ab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830269208203e880a09d4bed1c42dc3a6e6fc7e12c185aebcfd0c2777c69ffaaeba015ab5c6eeea84d888e297352eb1823aef882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0489e3b85b77513812fb465d6aa1859a6e2696587be8c2232a8f4179c49097d17a078f3d105c5d901853811a363507c4b9e9302064cabb872cf07e4e4437ef3e45ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -468,11 +689,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x09ac05f326cb98e08970f368bebf0b0cea0e8f2199efd982a2009fac296ac996",
-        "network" : "Frontier",
+        "lastblockhash" : "0xcded80e0e7993f5d533c6bd8d508679330cc50c72467d4dea2efdc7a5a3d1453",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f67100",
+                "balance" : "0x4563918244f66920",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,14 +728,14 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a29f00",
+                "balance" : "0xe8d4a2a6d6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
-                "balance" : "0x00",
+                "balance" : "0x0a",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
@@ -608,10 +829,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g2v1_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d0g2v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g2v1Filler.json"
         },
         "blocks" : [
@@ -623,9 +844,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0xdb3cc470750af905f7713a17c6ef49c2c4c38df5c6bb282c91751f7c00af0aef",
-                    "mixHash" : "0xd778bdb80e87dab487393a8a039cce211621f4ea4b1c153199b718695deba570",
-                    "nonce" : "0x1fcabc00c84eae78",
+                    "hash" : "0x5c047d1134bafc3e765c7d73d61281317a3163271ae614f7c789eccf2aa16441",
+                    "mixHash" : "0x2c72249d7c631bf0b5d6898832bfb353f5ebf08a731a905512b9f254bc6b0a6b",
+                    "nonce" : "0xb0417e8af6eaa8a0",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
@@ -634,7 +855,7 @@
                     "transactionsTrie" : "0xccf3d8ee7d2a6f8a893fa9dc4b9aef3edefff03c065223437e329313494f2d72",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea0ccf3d8ee7d2a6f8a893fa9dc4b9aef3edefff03c065223437e329313494f2d72a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0d778bdb80e87dab487393a8a039cce211621f4ea4b1c153199b718695deba570881fcabc00c84eae78f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0489e3b85b77513812fb465d6aa1859a6e2696587be8c2232a8f4179c49097d17a078f3d105c5d901853811a363507c4b9e9302064cabb872cf07e4e4437ef3e45ac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea0ccf3d8ee7d2a6f8a893fa9dc4b9aef3edefff03c065223437e329313494f2d72a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a02c72249d7c631bf0b5d6898832bfb353f5ebf08a731a905512b9f254bc6b0a6b88b0417e8af6eaa8a0f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0489e3b85b77513812fb465d6aa1859a6e2696587be8c2232a8f4179c49097d17a078f3d105c5d901853811a363507c4b9e9302064cabb872cf07e4e4437ef3e45ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -671,8 +892,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdb3cc470750af905f7713a17c6ef49c2c4c38df5c6bb282c91751f7c00af0aef",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5c047d1134bafc3e765c7d73d61281317a3163271ae614f7c789eccf2aa16441",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f67100",
@@ -811,10 +1032,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g2v1_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d0g2v1_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g2v1Filler.json"
         },
         "blocks" : [
@@ -825,19 +1046,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0239b4",
-                    "hash" : "0x35e150d196122e4994ba135b9e162bf162f94325240d834f4ca6a68808e5bbcc",
-                    "mixHash" : "0x5f853fc23c81d52e6b660011492a396ce20f306027ec3e882b7a3c3f153b1428",
-                    "nonce" : "0x13a5eaa0fa10b309",
+                    "gasUsed" : "0x027100",
+                    "hash" : "0x79e7f375ef1d74b0984b1047910f182c7fed2f10c65791d8aa1da2598a4878a3",
+                    "mixHash" : "0xa660f42e7ce1e2174465013e27599f2be1479051f6821768dcad87685821914c",
+                    "nonce" : "0x880d95926f44b8ce",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x2c8982f9884df66f5bff5b9487b808a3115de89765f000b65f769677eaa677cf",
-                    "stateRoot" : "0xf053e14c382ddd102b251e499e1676e467a97dab33a05192e702ddde4975000d",
+                    "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
+                    "stateRoot" : "0x73f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xccf3d8ee7d2a6f8a893fa9dc4b9aef3edefff03c065223437e329313494f2d72",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f053e14c382ddd102b251e499e1676e467a97dab33a05192e702ddde4975000da0ccf3d8ee7d2a6f8a893fa9dc4b9aef3edefff03c065223437e329313494f2d72a02c8982f9884df66f5bff5b9487b808a3115de89765f000b65f769677eaa677cfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239b48203e880a05f853fc23c81d52e6b660011492a396ce20f306027ec3e882b7a3c3f153b14288813a5eaa0fa10b309f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0489e3b85b77513812fb465d6aa1859a6e2696587be8c2232a8f4179c49097d17a078f3d105c5d901853811a363507c4b9e9302064cabb872cf07e4e4437ef3e45ac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea0ccf3d8ee7d2a6f8a893fa9dc4b9aef3edefff03c065223437e329313494f2d72a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0a660f42e7ce1e2174465013e27599f2be1479051f6821768dcad87685821914c88880d95926f44b8cef882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0489e3b85b77513812fb465d6aa1859a6e2696587be8c2232a8f4179c49097d17a078f3d105c5d901853811a363507c4b9e9302064cabb872cf07e4e4437ef3e45ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -874,30 +1095,21 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x35e150d196122e4994ba135b9e162bf162f94325240d834f4ca6a68808e5bbcc",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x79e7f375ef1d74b0984b1047910f182c7fed2f10c65791d8aa1da2598a4878a3",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f639b4",
+                "balance" : "0x4563918244f67100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa000000000000000000000000000000000000000" : {
-                "balance" : "0x0a",
+                "balance" : "0x00",
                 "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x04" : "0x0c",
-                    "0x05" : "0x0c"
                 }
             },
             "0xa100000000000000000000000000000000000000" : {
@@ -922,7 +1134,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2d642",
+                "balance" : "0xe8d4a29f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g3v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g3v0.json
index e595d6ba3..db5d3606b 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g3v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d0g3v0_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d0g3v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g3v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc19a",
-                    "hash" : "0x980d8ae5af95aedf9f28165361352960a65f958b53a7a2cda3568ab2f2955dd5",
-                    "mixHash" : "0xd9da7e475c8736cc31f0d552b9c6f5215772482b881eef4ce2fd88a7b6e48967",
-                    "nonce" : "0x2d2e9f0524c6a63e",
+                    "hash" : "0x6090c6fe22dd6a63ef242bbad20e026a286d1dd70fe48971cbf5160782e0aefc",
+                    "mixHash" : "0x6a75b3ac4bb70eb571d5952f6226a534d1fa49f6ada8047fa45c1b3d9390bfeb",
+                    "nonce" : "0x4d183adff23aa89d",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x49a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2",
-                    "stateRoot" : "0xb4256760b0753a45c56007cb8a35d18a80d9f299b53a760175cc01ceb6ca5f21",
+                    "receiptTrie" : "0xa5d0e8d32ee861e79b211e90c606d96e95bc73bea255ede5fb9fd90bb7cedb39",
+                    "stateRoot" : "0x0725c487930e2041eba0397686c9146c5f6febc65a64f425b8b748883d8428fc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1bf80d790c82bca8ebd94abbc56c23fd9cd72cc5b8e9e83f98563db0b15026a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4256760b0753a45c56007cb8a35d18a80d9f299b53a760175cc01ceb6ca5f21a01bf80d790c82bca8ebd94abbc56c23fd9cd72cc5b8e9e83f98563db0b15026a9a049a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a0d9da7e475c8736cc31f0d552b9c6f5215772482b881eef4ce2fd88a7b6e48967882d2e9f0524c6a63ef881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ba09daaa3f142f48d733d3b1313c7a2aa3899f40d7c608b2e8e0f54009f08115590a031dfd9b16417f6c84a89dfed947ac5c6dfa47f7d6df832b066f35f888396aa8fc0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00725c487930e2041eba0397686c9146c5f6febc65a64f425b8b748883d8428fca01bf80d790c82bca8ebd94abbc56c23fd9cd72cc5b8e9e83f98563db0b15026a9a0a5d0e8d32ee861e79b211e90c606d96e95bc73bea255ede5fb9fd90bb7cedb39b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a06a75b3ac4bb70eb571d5952f6226a534d1fa49f6ada8047fa45c1b3d9390bfeb884d183adff23aa89df881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ba09daaa3f142f48d733d3b1313c7a2aa3899f40d7c608b2e8e0f54009f08115590a031dfd9b16417f6c84a89dfed947ac5c6dfa47f7d6df832b066f35f888396aa8fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x980d8ae5af95aedf9f28165361352960a65f958b53a7a2cda3568ab2f2955dd5",
-        "network" : "EIP150",
+        "lastblockhash" : "0x6090c6fe22dd6a63ef242bbad20e026a286d1dd70fe48971cbf5160782e0aefc",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c19a",
                 "code" : "",
@@ -202,10 +209,220 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g3v0_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d0g3v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g3v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xc19a",
+                    "hash" : "0xa77e89a8a6b56509c6a3f8b5ee7666b32f7d570d6a81749b21e066b007b2f9d3",
+                    "mixHash" : "0x4f7e67fb564a4b1848e4ec15e075d3f8593299ca197af3ef835ec81681635e1a",
+                    "nonce" : "0x8d87589a85188e99",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0xa5d0e8d32ee861e79b211e90c606d96e95bc73bea255ede5fb9fd90bb7cedb39",
+                    "stateRoot" : "0x0725c487930e2041eba0397686c9146c5f6febc65a64f425b8b748883d8428fc",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1bf80d790c82bca8ebd94abbc56c23fd9cd72cc5b8e9e83f98563db0b15026a9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00725c487930e2041eba0397686c9146c5f6febc65a64f425b8b748883d8428fca01bf80d790c82bca8ebd94abbc56c23fd9cd72cc5b8e9e83f98563db0b15026a9a0a5d0e8d32ee861e79b211e90c606d96e95bc73bea255ede5fb9fd90bb7cedb39b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a04f7e67fb564a4b1848e4ec15e075d3f8593299ca197af3ef835ec81681635e1a888d87589a85188e99f881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ba09daaa3f142f48d733d3b1313c7a2aa3899f40d7c608b2e8e0f54009f08115590a031dfd9b16417f6c84a89dfed947ac5c6dfa47f7d6df832b066f35f888396aa8fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
+                        "gasLimit" : "0xc350",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9daaa3f142f48d733d3b1313c7a2aa3899f40d7c608b2e8e0f54009f08115590",
+                        "s" : "0x31dfd9b16417f6c84a89dfed947ac5c6dfa47f7d6df832b066f35f888396aa8f",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa77e89a8a6b56509c6a3f8b5ee7666b32f7d570d6a81749b21e066b007b2f9d3",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c19a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a44e66",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d0g3v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g3v0Filler.json"
         },
         "blocks" : [
@@ -217,9 +434,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc19a",
-                    "hash" : "0xdd79f55ae1bd9ecca0e78f87e2792af0f2c2f2f3a89fa40a08a26880408ad7f4",
-                    "mixHash" : "0x7b8e2726e5a624f4b1b51c3d2be28a779372ab1b857262990b8a44377f890301",
-                    "nonce" : "0xea284b9b33d0ee7d",
+                    "hash" : "0x37fb377df2ab75e9174f1f0543b8735b455ce9b4f8b6974dfc228d1159fec270",
+                    "mixHash" : "0x3d9dff95a75301d05a1e351aa630e42f2c4343f91dc4b3926ca1f3c7534132c3",
+                    "nonce" : "0x7712b1ba77f21c4d",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x49a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2",
@@ -228,7 +445,7 @@
                     "transactionsTrie" : "0x1bf80d790c82bca8ebd94abbc56c23fd9cd72cc5b8e9e83f98563db0b15026a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4256760b0753a45c56007cb8a35d18a80d9f299b53a760175cc01ceb6ca5f21a01bf80d790c82bca8ebd94abbc56c23fd9cd72cc5b8e9e83f98563db0b15026a9a049a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a07b8e2726e5a624f4b1b51c3d2be28a779372ab1b857262990b8a44377f89030188ea284b9b33d0ee7df881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ba09daaa3f142f48d733d3b1313c7a2aa3899f40d7c608b2e8e0f54009f08115590a031dfd9b16417f6c84a89dfed947ac5c6dfa47f7d6df832b066f35f888396aa8fc0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4256760b0753a45c56007cb8a35d18a80d9f299b53a760175cc01ceb6ca5f21a01bf80d790c82bca8ebd94abbc56c23fd9cd72cc5b8e9e83f98563db0b15026a9a049a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a03d9dff95a75301d05a1e351aa630e42f2c4343f91dc4b3926ca1f3c7534132c3887712b1ba77f21c4df881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ba09daaa3f142f48d733d3b1313c7a2aa3899f40d7c608b2e8e0f54009f08115590a031dfd9b16417f6c84a89dfed947ac5c6dfa47f7d6df832b066f35f888396aa8fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -265,8 +482,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdd79f55ae1bd9ecca0e78f87e2792af0f2c2f2f3a89fa40a08a26880408ad7f4",
-        "network" : "EIP158",
+        "lastblockhash" : "0x37fb377df2ab75e9174f1f0543b8735b455ce9b4f8b6974dfc228d1159fec270",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c19a",
@@ -405,10 +622,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g3v0_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d0g3v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g3v0Filler.json"
         },
         "blocks" : [
@@ -419,19 +636,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xc350",
-                    "hash" : "0x088692aac6ce5160fa13d399ad166d7b90685bc1067b761dac82167294859ccf",
-                    "mixHash" : "0x87c5e7f05dbbc094350d9dec981c20358b6eb89d1f7d0b9f8d888ad707ea2f2d",
-                    "nonce" : "0x1b0777cc09254b0d",
+                    "gasUsed" : "0xc19a",
+                    "hash" : "0x9fa6815f9f0a738694e19f663b299f2124ce443b75557b4de0800613bb9eae7e",
+                    "mixHash" : "0x1b9478011c1471099eee4a7a6f8ea8768e9e6620a1e7c48c33b388df3ba73c18",
+                    "nonce" : "0xccb4295d2606289c",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xb30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5a",
-                    "stateRoot" : "0xda427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5",
+                    "receiptTrie" : "0x49a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2",
+                    "stateRoot" : "0xb4256760b0753a45c56007cb8a35d18a80d9f299b53a760175cc01ceb6ca5f21",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1bf80d790c82bca8ebd94abbc56c23fd9cd72cc5b8e9e83f98563db0b15026a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a01bf80d790c82bca8ebd94abbc56c23fd9cd72cc5b8e9e83f98563db0b15026a9a0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a087c5e7f05dbbc094350d9dec981c20358b6eb89d1f7d0b9f8d888ad707ea2f2d881b0777cc09254b0df881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ba09daaa3f142f48d733d3b1313c7a2aa3899f40d7c608b2e8e0f54009f08115590a031dfd9b16417f6c84a89dfed947ac5c6dfa47f7d6df832b066f35f888396aa8fc0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4256760b0753a45c56007cb8a35d18a80d9f299b53a760175cc01ceb6ca5f21a01bf80d790c82bca8ebd94abbc56c23fd9cd72cc5b8e9e83f98563db0b15026a9a049a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a01b9478011c1471099eee4a7a6f8ea8768e9e6620a1e7c48c33b388df3ba73c1888ccb4295d2606289cf881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ba09daaa3f142f48d733d3b1313c7a2aa3899f40d7c608b2e8e0f54009f08115590a031dfd9b16417f6c84a89dfed947ac5c6dfa47f7d6df832b066f35f888396aa8fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -468,11 +685,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x088692aac6ce5160fa13d399ad166d7b90685bc1067b761dac82167294859ccf",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9fa6815f9f0a738694e19f663b299f2124ce443b75557b4de0800613bb9eae7e",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4c350",
+                "balance" : "0x4563918244f4c19a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,7 +724,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a44cb0",
+                "balance" : "0xe8d4a44e66",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -608,10 +825,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g3v0_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d0g3v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g3v0Filler.json"
         },
         "blocks" : [
@@ -623,9 +840,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc350",
-                    "hash" : "0x88092e28475f76c84597403bfeed905f433c82e3d44706bd2e0bafe354e751f9",
-                    "mixHash" : "0x4769674cdf526f24b8007ecd8e7aba9891053691b64619360dd923554d75ea8c",
-                    "nonce" : "0x307bf9a707ec88bd",
+                    "hash" : "0xe3071963cc3541694da266d65dcd12213e115a40aac6bddfb5df2d9f2a737bd7",
+                    "mixHash" : "0x605d7f5452d42fb648f8a2dba2f217d04cf74d85865d261534a6bffedfda2bcb",
+                    "nonce" : "0x73b38a9d787f45d1",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xb30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5a",
@@ -634,7 +851,7 @@
                     "transactionsTrie" : "0x1bf80d790c82bca8ebd94abbc56c23fd9cd72cc5b8e9e83f98563db0b15026a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a01bf80d790c82bca8ebd94abbc56c23fd9cd72cc5b8e9e83f98563db0b15026a9a0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a04769674cdf526f24b8007ecd8e7aba9891053691b64619360dd923554d75ea8c88307bf9a707ec88bdf881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ba09daaa3f142f48d733d3b1313c7a2aa3899f40d7c608b2e8e0f54009f08115590a031dfd9b16417f6c84a89dfed947ac5c6dfa47f7d6df832b066f35f888396aa8fc0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a01bf80d790c82bca8ebd94abbc56c23fd9cd72cc5b8e9e83f98563db0b15026a9a0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a0605d7f5452d42fb648f8a2dba2f217d04cf74d85865d261534a6bffedfda2bcb8873b38a9d787f45d1f881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ba09daaa3f142f48d733d3b1313c7a2aa3899f40d7c608b2e8e0f54009f08115590a031dfd9b16417f6c84a89dfed947ac5c6dfa47f7d6df832b066f35f888396aa8fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -671,8 +888,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x88092e28475f76c84597403bfeed905f433c82e3d44706bd2e0bafe354e751f9",
-        "network" : "Homestead",
+        "lastblockhash" : "0xe3071963cc3541694da266d65dcd12213e115a40aac6bddfb5df2d9f2a737bd7",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c350",
@@ -811,10 +1028,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g3v0_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d0g3v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g3v0Filler.json"
         },
         "blocks" : [
@@ -825,19 +1042,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xc19a",
-                    "hash" : "0xb4cf2ed28db5146fb28042e91167163827e49fc1af23baf20c7ee6310b2dbf5b",
-                    "mixHash" : "0xc334660797ca7576d62ebbc2483d7fec64270f6b6372ab605c2f808e0158a250",
-                    "nonce" : "0x7ed78b0678f01a53",
+                    "gasUsed" : "0xc350",
+                    "hash" : "0x71f3bf7efe1b6676f650e1fba75e4bfecc9ba29ad9ee945f375e6cd232f0a804",
+                    "mixHash" : "0x4aeb6f8b300ce3c94f2e48f7462ce68ec8c426e6f2d97f4872200dd110e16725",
+                    "nonce" : "0x190d21de9b926185",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xa5d0e8d32ee861e79b211e90c606d96e95bc73bea255ede5fb9fd90bb7cedb39",
-                    "stateRoot" : "0x0725c487930e2041eba0397686c9146c5f6febc65a64f425b8b748883d8428fc",
+                    "receiptTrie" : "0xb30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5a",
+                    "stateRoot" : "0xda427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1bf80d790c82bca8ebd94abbc56c23fd9cd72cc5b8e9e83f98563db0b15026a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00725c487930e2041eba0397686c9146c5f6febc65a64f425b8b748883d8428fca01bf80d790c82bca8ebd94abbc56c23fd9cd72cc5b8e9e83f98563db0b15026a9a0a5d0e8d32ee861e79b211e90c606d96e95bc73bea255ede5fb9fd90bb7cedb39b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a0c334660797ca7576d62ebbc2483d7fec64270f6b6372ab605c2f808e0158a250887ed78b0678f01a53f881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ba09daaa3f142f48d733d3b1313c7a2aa3899f40d7c608b2e8e0f54009f08115590a031dfd9b16417f6c84a89dfed947ac5c6dfa47f7d6df832b066f35f888396aa8fc0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a01bf80d790c82bca8ebd94abbc56c23fd9cd72cc5b8e9e83f98563db0b15026a9a0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a04aeb6f8b300ce3c94f2e48f7462ce68ec8c426e6f2d97f4872200dd110e1672588190d21de9b926185f881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a0000000000000000000000000000000000000001ba09daaa3f142f48d733d3b1313c7a2aa3899f40d7c608b2e8e0f54009f08115590a031dfd9b16417f6c84a89dfed947ac5c6dfa47f7d6df832b066f35f888396aa8fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -874,18 +1091,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb4cf2ed28db5146fb28042e91167163827e49fc1af23baf20c7ee6310b2dbf5b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x71f3bf7efe1b6676f650e1fba75e4bfecc9ba29ad9ee945f375e6cd232f0a804",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4c19a",
+                "balance" : "0x4563918244f4c350",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -920,7 +1130,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a44e66",
+                "balance" : "0xe8d4a44cb0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g3v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g3v1.json
index 5d402b3e8..d5dc1a0b7 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g3v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d0g3v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d0g3v1_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d0g3v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g3v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc226",
-                    "hash" : "0x4698a9bd5b8de1b007da72b54f07167d7a100be78cb16bee343cf98690d0ca2f",
-                    "mixHash" : "0x5757a5fc23d5e980b8f914082c10052b485fb247969f0420e560dae8d11782a6",
-                    "nonce" : "0xb2365a7f7dc2f05c",
+                    "hash" : "0xec6a0e5730cda1a17ce393ea0e38e06cab110c4ec6abd366d4f5e8b580557a71",
+                    "mixHash" : "0xbaa8d2277c3602f8a7b11d2df85a41c1ee4f3a3da6803811b93d87091f3a43aa",
+                    "nonce" : "0xd42aa3eedeacbc8c",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xc08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4c",
-                    "stateRoot" : "0xede8b4f79f3e9d00052f7a6111b2b15b7d2784ead53ac798c77024c2f0cb5b06",
+                    "receiptTrie" : "0xbe3284c0f7a475fbc5c36b9a141a86ede36cdafe3c5e0928c790f55bab94282f",
+                    "stateRoot" : "0x3213a013e840252b435ab91b5ecc837800928f2d3ccef81bdc358cbd7f78e69b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x38ef553e054d3f5b9834d5f61c4419350a19e4a092e6771b1d332997be626552",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ede8b4f79f3e9d00052f7a6111b2b15b7d2784ead53ac798c77024c2f0cb5b06a038ef553e054d3f5b9834d5f61c4419350a19e4a092e6771b1d332997be626552a0c08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a05757a5fc23d5e980b8f914082c10052b485fb247969f0420e560dae8d11782a688b2365a7f7dc2f05cf881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0709328ccb1369916205c51747f80bdecd5168599dcf7ebe26b749702adf186b4a01a3b0479c26276ce49002a1b545f1ef33ba88caefcc369e047a608459aa1ad65c0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03213a013e840252b435ab91b5ecc837800928f2d3ccef81bdc358cbd7f78e69ba038ef553e054d3f5b9834d5f61c4419350a19e4a092e6771b1d332997be626552a0be3284c0f7a475fbc5c36b9a141a86ede36cdafe3c5e0928c790f55bab94282fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a0baa8d2277c3602f8a7b11d2df85a41c1ee4f3a3da6803811b93d87091f3a43aa88d42aa3eedeacbc8cf881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0709328ccb1369916205c51747f80bdecd5168599dcf7ebe26b749702adf186b4a01a3b0479c26276ce49002a1b545f1ef33ba88caefcc369e047a608459aa1ad65c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4698a9bd5b8de1b007da72b54f07167d7a100be78cb16bee343cf98690d0ca2f",
-        "network" : "EIP150",
+        "lastblockhash" : "0xec6a0e5730cda1a17ce393ea0e38e06cab110c4ec6abd366d4f5e8b580557a71",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c226",
                 "code" : "",
@@ -202,10 +209,220 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g3v1_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d0g3v1_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g3v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xc226",
+                    "hash" : "0xdbc9303b0b421fa1d05cd3362fdb5aa659e7c4633390a4775139e1341d578179",
+                    "mixHash" : "0x9a594e83d15a00e8ef48c0369ed7debf513be8dcfe6c4d0b4123a9762c6d28b3",
+                    "nonce" : "0xe0907c6f73ef624f",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0xbe3284c0f7a475fbc5c36b9a141a86ede36cdafe3c5e0928c790f55bab94282f",
+                    "stateRoot" : "0x3213a013e840252b435ab91b5ecc837800928f2d3ccef81bdc358cbd7f78e69b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x38ef553e054d3f5b9834d5f61c4419350a19e4a092e6771b1d332997be626552",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03213a013e840252b435ab91b5ecc837800928f2d3ccef81bdc358cbd7f78e69ba038ef553e054d3f5b9834d5f61c4419350a19e4a092e6771b1d332997be626552a0be3284c0f7a475fbc5c36b9a141a86ede36cdafe3c5e0928c790f55bab94282fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a09a594e83d15a00e8ef48c0369ed7debf513be8dcfe6c4d0b4123a9762c6d28b388e0907c6f73ef624ff881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0709328ccb1369916205c51747f80bdecd5168599dcf7ebe26b749702adf186b4a01a3b0479c26276ce49002a1b545f1ef33ba88caefcc369e047a608459aa1ad65c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
+                        "gasLimit" : "0xc350",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x709328ccb1369916205c51747f80bdecd5168599dcf7ebe26b749702adf186b4",
+                        "s" : "0x1a3b0479c26276ce49002a1b545f1ef33ba88caefcc369e047a608459aa1ad65",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdbc9303b0b421fa1d05cd3362fdb5aa659e7c4633390a4775139e1341d578179",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c226",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a44dd0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x0a",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d0g3v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g3v1Filler.json"
         },
         "blocks" : [
@@ -217,9 +434,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc226",
-                    "hash" : "0x4d7dffdbec013c0d8c99efb9bc4d1fd4fedb4682d6cecd66b705d973071de494",
-                    "mixHash" : "0x65410675ca401adc772665a6bbc373f47ccd092ed82903fff022799dd2342f71",
-                    "nonce" : "0xc7ec9eac88b5d1e2",
+                    "hash" : "0xe5d84f2bfecbd5b1845761cc5d40c22a56d0017c6696184a50d4cea178e750b9",
+                    "mixHash" : "0x070978757625f77d745ca3036aa81eb7ae840dd6708d58ae502e8ca6b50fbb4f",
+                    "nonce" : "0x0ef197fd4798690a",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xc08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4c",
@@ -228,7 +445,7 @@
                     "transactionsTrie" : "0x38ef553e054d3f5b9834d5f61c4419350a19e4a092e6771b1d332997be626552",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ede8b4f79f3e9d00052f7a6111b2b15b7d2784ead53ac798c77024c2f0cb5b06a038ef553e054d3f5b9834d5f61c4419350a19e4a092e6771b1d332997be626552a0c08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a065410675ca401adc772665a6bbc373f47ccd092ed82903fff022799dd2342f7188c7ec9eac88b5d1e2f881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0709328ccb1369916205c51747f80bdecd5168599dcf7ebe26b749702adf186b4a01a3b0479c26276ce49002a1b545f1ef33ba88caefcc369e047a608459aa1ad65c0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ede8b4f79f3e9d00052f7a6111b2b15b7d2784ead53ac798c77024c2f0cb5b06a038ef553e054d3f5b9834d5f61c4419350a19e4a092e6771b1d332997be626552a0c08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a0070978757625f77d745ca3036aa81eb7ae840dd6708d58ae502e8ca6b50fbb4f880ef197fd4798690af881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0709328ccb1369916205c51747f80bdecd5168599dcf7ebe26b749702adf186b4a01a3b0479c26276ce49002a1b545f1ef33ba88caefcc369e047a608459aa1ad65c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -265,8 +482,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4d7dffdbec013c0d8c99efb9bc4d1fd4fedb4682d6cecd66b705d973071de494",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe5d84f2bfecbd5b1845761cc5d40c22a56d0017c6696184a50d4cea178e750b9",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c226",
@@ -405,10 +622,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g3v1_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d0g3v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g3v1Filler.json"
         },
         "blocks" : [
@@ -419,19 +636,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xc350",
-                    "hash" : "0x6304c04b5d7149092d2265fe7d06f2e3d8f56b9ee9768aa8b00c5ed12b6b4109",
-                    "mixHash" : "0xf2869e543f4029496e49284071118a657606cbe80823ba3c6570fcc156798466",
-                    "nonce" : "0x78b8ee2ead336baf",
+                    "gasUsed" : "0xc226",
+                    "hash" : "0x1b97b89b467cfe9ba000233351e78ec41cc21f877b427d415e89d9e546b20e24",
+                    "mixHash" : "0x3951f2490b1bb0ce538d7dfb76fc69e06c13331ecfa1add886f152e444457bf2",
+                    "nonce" : "0xe2240541944c955f",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xb30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5a",
-                    "stateRoot" : "0xda427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5",
+                    "receiptTrie" : "0xc08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4c",
+                    "stateRoot" : "0xede8b4f79f3e9d00052f7a6111b2b15b7d2784ead53ac798c77024c2f0cb5b06",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x38ef553e054d3f5b9834d5f61c4419350a19e4a092e6771b1d332997be626552",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a038ef553e054d3f5b9834d5f61c4419350a19e4a092e6771b1d332997be626552a0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a0f2869e543f4029496e49284071118a657606cbe80823ba3c6570fcc1567984668878b8ee2ead336baff881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0709328ccb1369916205c51747f80bdecd5168599dcf7ebe26b749702adf186b4a01a3b0479c26276ce49002a1b545f1ef33ba88caefcc369e047a608459aa1ad65c0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ede8b4f79f3e9d00052f7a6111b2b15b7d2784ead53ac798c77024c2f0cb5b06a038ef553e054d3f5b9834d5f61c4419350a19e4a092e6771b1d332997be626552a0c08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a03951f2490b1bb0ce538d7dfb76fc69e06c13331ecfa1add886f152e444457bf288e2240541944c955ff881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0709328ccb1369916205c51747f80bdecd5168599dcf7ebe26b749702adf186b4a01a3b0479c26276ce49002a1b545f1ef33ba88caefcc369e047a608459aa1ad65c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -468,11 +685,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6304c04b5d7149092d2265fe7d06f2e3d8f56b9ee9768aa8b00c5ed12b6b4109",
-        "network" : "Frontier",
+        "lastblockhash" : "0x1b97b89b467cfe9ba000233351e78ec41cc21f877b427d415e89d9e546b20e24",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4c350",
+                "balance" : "0x4563918244f4c226",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,14 +724,14 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a44cb0",
+                "balance" : "0xe8d4a44dd0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
-                "balance" : "0x00",
+                "balance" : "0x0a",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
@@ -608,10 +825,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g3v1_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d0g3v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g3v1Filler.json"
         },
         "blocks" : [
@@ -623,9 +840,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc350",
-                    "hash" : "0xdc45d3299a16c0ca00d49d372105708aaa13e8da54177758db58589d746c8313",
-                    "mixHash" : "0xf8be05dc69d8394b12ebcbc8964fe8811cf1dce68840868f750d279b1e0643d6",
-                    "nonce" : "0xe5cbe73243c8333e",
+                    "hash" : "0xaec46ace3f54ca959225066d8872a10610373573b6d42f904b7e43823c6af1b8",
+                    "mixHash" : "0x4e8a82c7090d440413627098bf19f76401d5cbcf70447d07f6ebc6c58b06883d",
+                    "nonce" : "0x1a5a6547385c0ee3",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xb30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5a",
@@ -634,7 +851,7 @@
                     "transactionsTrie" : "0x38ef553e054d3f5b9834d5f61c4419350a19e4a092e6771b1d332997be626552",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a038ef553e054d3f5b9834d5f61c4419350a19e4a092e6771b1d332997be626552a0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a0f8be05dc69d8394b12ebcbc8964fe8811cf1dce68840868f750d279b1e0643d688e5cbe73243c8333ef881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0709328ccb1369916205c51747f80bdecd5168599dcf7ebe26b749702adf186b4a01a3b0479c26276ce49002a1b545f1ef33ba88caefcc369e047a608459aa1ad65c0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a038ef553e054d3f5b9834d5f61c4419350a19e4a092e6771b1d332997be626552a0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a04e8a82c7090d440413627098bf19f76401d5cbcf70447d07f6ebc6c58b06883d881a5a6547385c0ee3f881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0709328ccb1369916205c51747f80bdecd5168599dcf7ebe26b749702adf186b4a01a3b0479c26276ce49002a1b545f1ef33ba88caefcc369e047a608459aa1ad65c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -671,8 +888,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdc45d3299a16c0ca00d49d372105708aaa13e8da54177758db58589d746c8313",
-        "network" : "Homestead",
+        "lastblockhash" : "0xaec46ace3f54ca959225066d8872a10610373573b6d42f904b7e43823c6af1b8",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c350",
@@ -811,10 +1028,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d0g3v1_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d0g3v1_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d0g3v1Filler.json"
         },
         "blocks" : [
@@ -825,19 +1042,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xc226",
-                    "hash" : "0x4044a9f7d11af144a3ba750a46818fa31f9f2b86870f82165c8901d1b837b3b7",
-                    "mixHash" : "0xc4954de0868e172b6a300b0d7c6b72f9cb75f93f5d6889ad3b4e55dc2c55ff4e",
-                    "nonce" : "0x0e55e2f1dc19f32e",
+                    "gasUsed" : "0xc350",
+                    "hash" : "0x9935b3d3c8310e4802958a537f612a0e204c2a0c59455d3bcb23ac06457a98eb",
+                    "mixHash" : "0x81039c5213e25a02274fa8ef1b00c22cdc5f7b049d77f403c7509806f5512a9a",
+                    "nonce" : "0xf39522c0267a50a7",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xbe3284c0f7a475fbc5c36b9a141a86ede36cdafe3c5e0928c790f55bab94282f",
-                    "stateRoot" : "0x3213a013e840252b435ab91b5ecc837800928f2d3ccef81bdc358cbd7f78e69b",
+                    "receiptTrie" : "0xb30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5a",
+                    "stateRoot" : "0xda427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x38ef553e054d3f5b9834d5f61c4419350a19e4a092e6771b1d332997be626552",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03213a013e840252b435ab91b5ecc837800928f2d3ccef81bdc358cbd7f78e69ba038ef553e054d3f5b9834d5f61c4419350a19e4a092e6771b1d332997be626552a0be3284c0f7a475fbc5c36b9a141a86ede36cdafe3c5e0928c790f55bab94282fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a0c4954de0868e172b6a300b0d7c6b72f9cb75f93f5d6889ad3b4e55dc2c55ff4e880e55e2f1dc19f32ef881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0709328ccb1369916205c51747f80bdecd5168599dcf7ebe26b749702adf186b4a01a3b0479c26276ce49002a1b545f1ef33ba88caefcc369e047a608459aa1ad65c0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a038ef553e054d3f5b9834d5f61c4419350a19e4a092e6771b1d332997be626552a0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a081039c5213e25a02274fa8ef1b00c22cdc5f7b049d77f403c7509806f5512a9a88f39522c0267a50a7f881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a0000000000000000000000000000000000000001ba0709328ccb1369916205c51747f80bdecd5168599dcf7ebe26b749702adf186b4a01a3b0479c26276ce49002a1b545f1ef33ba88caefcc369e047a608459aa1ad65c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a000000000000000000000000000000000000000",
@@ -874,18 +1091,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4044a9f7d11af144a3ba750a46818fa31f9f2b86870f82165c8901d1b837b3b7",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9935b3d3c8310e4802958a537f612a0e204c2a0c59455d3bcb23ac06457a98eb",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4c226",
+                "balance" : "0x4563918244f4c350",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -920,14 +1130,14 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a44dd0",
+                "balance" : "0xe8d4a44cb0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
-                "balance" : "0x0a",
+                "balance" : "0x00",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g0v0.json
index cbc9b4af9..1b1378704 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d1g0v0_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d1g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x037eeb",
-                    "hash" : "0xa61cd6b8215673ee1909f536b2ce621e46a90df802022231494b5f30a6afe56c",
-                    "mixHash" : "0x6421d985fecc2d1058c0621fabb2383f13455affb99ce29acdf28b9f9687f1f8",
-                    "nonce" : "0x6f18463c190a0070",
+                    "gasUsed" : "0x021f88",
+                    "hash" : "0x72281751b6e9075381db65611ad2450b3ef509161ab1c643587e0a5d34fa2748",
+                    "mixHash" : "0xf7f0bff56a8d6c56f8b1cb6b611f40c1e53d952f39aab51430b677fb6abf1904",
+                    "nonce" : "0xd239687f3363f6ba",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xda3e9656328e2adbc2b87e8b04f9d43bb47d17eb351fd6a566f867784d66ee24",
-                    "stateRoot" : "0x7139c4cefdd6f49559f19580e4d5262d286b6751f6e93cde03cc3ab58cec1ee5",
+                    "receiptTrie" : "0x73ffc464b3c71b246e079dec87fc3e85ed52fb232d3aa6abfccceadb47864911",
+                    "stateRoot" : "0xac7d57dd85f91e28659d95ecf95d41284b7d97918e0cf41124399c2d54e9fa77",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe593ceb38d6e81b71222c0a2b5c11b4baf519e15e027834fb4805d7d8e2e84d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07139c4cefdd6f49559f19580e4d5262d286b6751f6e93cde03cc3ab58cec1ee5a0be593ceb38d6e81b71222c0a2b5c11b4baf519e15e027834fb4805d7d8e2e84da0da3e9656328e2adbc2b87e8b04f9d43bb47d17eb351fd6a566f867784d66ee24b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083037eeb8203e880a06421d985fecc2d1058c0621fabb2383f13455affb99ce29acdf28b9f9687f1f8886f18463c190a0070f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca068ec1cd3018d1de63a8b6a400552ba4cd19404b0fde8df65f3d0c26f2e6f5199a02ab57e853f25bb84599106b9792978117ce8521e19f5a9be5f4e6ed8a9f61681c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac7d57dd85f91e28659d95ecf95d41284b7d97918e0cf41124399c2d54e9fa77a0be593ceb38d6e81b71222c0a2b5c11b4baf519e15e027834fb4805d7d8e2e84da073ffc464b3c71b246e079dec87fc3e85ed52fb232d3aa6abfccceadb47864911b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021f888203e880a0f7f0bff56a8d6c56f8b1cb6b611f40c1e53d952f39aab51430b677fb6abf190488d239687f3363f6baf882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca068ec1cd3018d1de63a8b6a400552ba4cd19404b0fde8df65f3d0c26f2e6f5199a02ab57e853f25bb84599106b9792978117ce8521e19f5a9be5f4e6ed8a9f61681c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa61cd6b8215673ee1909f536b2ce621e46a90df802022231494b5f30a6afe56c",
-        "network" : "EIP150",
+        "lastblockhash" : "0x72281751b6e9075381db65611ad2450b3ef509161ab1c643587e0a5d34fa2748",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f77eeb",
+                "balance" : "0x4563918244f61f88",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -103,7 +110,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a19115",
+                "balance" : "0xe8d4a2f078",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -204,10 +211,222 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g0v0_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d1g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x021f88",
+                    "hash" : "0x0f07f791194691a9806ee2ec76b9f0e1615e19cf8ddd49f87149dcdd359f3a41",
+                    "mixHash" : "0x01ec69969d76970c84c16a1e7570eedcd7d7a0d01ae4276b0292718c254a2884",
+                    "nonce" : "0xce0f399625eaa3b0",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0x73ffc464b3c71b246e079dec87fc3e85ed52fb232d3aa6abfccceadb47864911",
+                    "stateRoot" : "0xac7d57dd85f91e28659d95ecf95d41284b7d97918e0cf41124399c2d54e9fa77",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xbe593ceb38d6e81b71222c0a2b5c11b4baf519e15e027834fb4805d7d8e2e84d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac7d57dd85f91e28659d95ecf95d41284b7d97918e0cf41124399c2d54e9fa77a0be593ceb38d6e81b71222c0a2b5c11b4baf519e15e027834fb4805d7d8e2e84da073ffc464b3c71b246e079dec87fc3e85ed52fb232d3aa6abfccceadb47864911b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021f888203e880a001ec69969d76970c84c16a1e7570eedcd7d7a0d01ae4276b0292718c254a288488ce0f399625eaa3b0f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca068ec1cd3018d1de63a8b6a400552ba4cd19404b0fde8df65f3d0c26f2e6f5199a02ab57e853f25bb84599106b9792978117ce8521e19f5a9be5f4e6ed8a9f61681c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
+                        "gasLimit" : "0x0c3500",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x68ec1cd3018d1de63a8b6a400552ba4cd19404b0fde8df65f3d0c26f2e6f5199",
+                        "s" : "0x2ab57e853f25bb84599106b9792978117ce8521e19f5a9be5f4e6ed8a9f61681",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0f07f791194691a9806ee2ec76b9f0e1615e19cf8ddd49f87149dcdd359f3a41",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f61f88",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c"
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2f078",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d1g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -219,9 +438,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x037eeb",
-                    "hash" : "0xe98159d0f56488b54ad2235aed4b88b9c35274d179400176a365fee92315662c",
-                    "mixHash" : "0xdebe6e9ffe628c641c025d5ecdb40ef890b0bd3f0bdee68d30100f65b3143e23",
-                    "nonce" : "0x7e8ee39d60a4ff49",
+                    "hash" : "0xe5d41d97b72c5cebee29f4880aebad4be788964f5596f69b45a73e4b08bae9cd",
+                    "mixHash" : "0x1f02a3a7f355d92ddb7503d74c4625c481dbc940f06a32211b285ae9bfd02a18",
+                    "nonce" : "0x06a995cf41ef1e30",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xda3e9656328e2adbc2b87e8b04f9d43bb47d17eb351fd6a566f867784d66ee24",
@@ -230,7 +449,7 @@
                     "transactionsTrie" : "0xbe593ceb38d6e81b71222c0a2b5c11b4baf519e15e027834fb4805d7d8e2e84d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07139c4cefdd6f49559f19580e4d5262d286b6751f6e93cde03cc3ab58cec1ee5a0be593ceb38d6e81b71222c0a2b5c11b4baf519e15e027834fb4805d7d8e2e84da0da3e9656328e2adbc2b87e8b04f9d43bb47d17eb351fd6a566f867784d66ee24b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083037eeb8203e880a0debe6e9ffe628c641c025d5ecdb40ef890b0bd3f0bdee68d30100f65b3143e23887e8ee39d60a4ff49f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca068ec1cd3018d1de63a8b6a400552ba4cd19404b0fde8df65f3d0c26f2e6f5199a02ab57e853f25bb84599106b9792978117ce8521e19f5a9be5f4e6ed8a9f61681c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07139c4cefdd6f49559f19580e4d5262d286b6751f6e93cde03cc3ab58cec1ee5a0be593ceb38d6e81b71222c0a2b5c11b4baf519e15e027834fb4805d7d8e2e84da0da3e9656328e2adbc2b87e8b04f9d43bb47d17eb351fd6a566f867784d66ee24b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083037eeb8203e880a01f02a3a7f355d92ddb7503d74c4625c481dbc940f06a32211b285ae9bfd02a188806a995cf41ef1e30f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca068ec1cd3018d1de63a8b6a400552ba4cd19404b0fde8df65f3d0c26f2e6f5199a02ab57e853f25bb84599106b9792978117ce8521e19f5a9be5f4e6ed8a9f61681c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -267,8 +486,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe98159d0f56488b54ad2235aed4b88b9c35274d179400176a365fee92315662c",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe5d41d97b72c5cebee29f4880aebad4be788964f5596f69b45a73e4b08bae9cd",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f77eeb",
@@ -409,10 +628,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g0v0_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d1g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -423,19 +642,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x03749b",
-                    "hash" : "0xb9dc83cfc943becced59bd45ef9a82e1c5a45e99eed5629b8bffb1a2d6f34a8c",
-                    "mixHash" : "0xda7ee38070a02e8c0c276c313918d210de302bd0b2f6c665b4343a2a7d22edfa",
-                    "nonce" : "0xb936cffcb2907e79",
+                    "gasUsed" : "0x037eeb",
+                    "hash" : "0x0c0deac79cced231f712e9ba344a7df6b626b6a89fd16c66335454e099a49b53",
+                    "mixHash" : "0x025d507faedf12d994e4ce937a4723395d892a41fd5844950a6764c933d71519",
+                    "nonce" : "0x1dc5675ca418784b",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x2cb2e1f785ede61944be6fb8b22863cc78774178dca89c932fc66bc96d7317df",
-                    "stateRoot" : "0x672c27160ccd3ef565dd42794b8529467c946997850b696d737a05130a433b17",
+                    "receiptTrie" : "0xda3e9656328e2adbc2b87e8b04f9d43bb47d17eb351fd6a566f867784d66ee24",
+                    "stateRoot" : "0x7139c4cefdd6f49559f19580e4d5262d286b6751f6e93cde03cc3ab58cec1ee5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe593ceb38d6e81b71222c0a2b5c11b4baf519e15e027834fb4805d7d8e2e84d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0672c27160ccd3ef565dd42794b8529467c946997850b696d737a05130a433b17a0be593ceb38d6e81b71222c0a2b5c11b4baf519e15e027834fb4805d7d8e2e84da02cb2e1f785ede61944be6fb8b22863cc78774178dca89c932fc66bc96d7317dfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808303749b8203e880a0da7ee38070a02e8c0c276c313918d210de302bd0b2f6c665b4343a2a7d22edfa88b936cffcb2907e79f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca068ec1cd3018d1de63a8b6a400552ba4cd19404b0fde8df65f3d0c26f2e6f5199a02ab57e853f25bb84599106b9792978117ce8521e19f5a9be5f4e6ed8a9f61681c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07139c4cefdd6f49559f19580e4d5262d286b6751f6e93cde03cc3ab58cec1ee5a0be593ceb38d6e81b71222c0a2b5c11b4baf519e15e027834fb4805d7d8e2e84da0da3e9656328e2adbc2b87e8b04f9d43bb47d17eb351fd6a566f867784d66ee24b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083037eeb8203e880a0025d507faedf12d994e4ce937a4723395d892a41fd5844950a6764c933d71519881dc5675ca418784bf882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca068ec1cd3018d1de63a8b6a400552ba4cd19404b0fde8df65f3d0c26f2e6f5199a02ab57e853f25bb84599106b9792978117ce8521e19f5a9be5f4e6ed8a9f61681c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -472,11 +691,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb9dc83cfc943becced59bd45ef9a82e1c5a45e99eed5629b8bffb1a2d6f34a8c",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0c0deac79cced231f712e9ba344a7df6b626b6a89fd16c66335454e099a49b53",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f7749b",
+                "balance" : "0x4563918244f77eeb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -513,7 +732,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a19b65",
+                "balance" : "0xe8d4a19115",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -614,10 +833,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g0v0_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d1g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -629,9 +848,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x03749b",
-                    "hash" : "0xc6a66df7f353b5bcf9b07d46f7711e40a070243b3858d6173d4952e44be7e5e3",
-                    "mixHash" : "0x2a737bbac6738d93b6e2f6adbc0c25226217e886e1c0bec3219959dfaee778ef",
-                    "nonce" : "0x3461132e826407d2",
+                    "hash" : "0xfa41b301d666a7d5d2ced2d6233d5b3f3c0afaf462efdc036235f6d8330faf0f",
+                    "mixHash" : "0x95d74b0db2e1bcec2b076ccc0634a9ac2ce64f8c0deb51887f06446a72d36cae",
+                    "nonce" : "0xe98d1622baa0f1a0",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x2cb2e1f785ede61944be6fb8b22863cc78774178dca89c932fc66bc96d7317df",
@@ -640,7 +859,7 @@
                     "transactionsTrie" : "0xbe593ceb38d6e81b71222c0a2b5c11b4baf519e15e027834fb4805d7d8e2e84d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0672c27160ccd3ef565dd42794b8529467c946997850b696d737a05130a433b17a0be593ceb38d6e81b71222c0a2b5c11b4baf519e15e027834fb4805d7d8e2e84da02cb2e1f785ede61944be6fb8b22863cc78774178dca89c932fc66bc96d7317dfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808303749b8203e880a02a737bbac6738d93b6e2f6adbc0c25226217e886e1c0bec3219959dfaee778ef883461132e826407d2f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca068ec1cd3018d1de63a8b6a400552ba4cd19404b0fde8df65f3d0c26f2e6f5199a02ab57e853f25bb84599106b9792978117ce8521e19f5a9be5f4e6ed8a9f61681c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0672c27160ccd3ef565dd42794b8529467c946997850b696d737a05130a433b17a0be593ceb38d6e81b71222c0a2b5c11b4baf519e15e027834fb4805d7d8e2e84da02cb2e1f785ede61944be6fb8b22863cc78774178dca89c932fc66bc96d7317dfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808303749b8203e880a095d74b0db2e1bcec2b076ccc0634a9ac2ce64f8c0deb51887f06446a72d36cae88e98d1622baa0f1a0f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca068ec1cd3018d1de63a8b6a400552ba4cd19404b0fde8df65f3d0c26f2e6f5199a02ab57e853f25bb84599106b9792978117ce8521e19f5a9be5f4e6ed8a9f61681c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -677,8 +896,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc6a66df7f353b5bcf9b07d46f7711e40a070243b3858d6173d4952e44be7e5e3",
-        "network" : "Homestead",
+        "lastblockhash" : "0xfa41b301d666a7d5d2ced2d6233d5b3f3c0afaf462efdc036235f6d8330faf0f",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f7749b",
@@ -819,10 +1038,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g0v0_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d1g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -833,19 +1052,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x021f88",
-                    "hash" : "0x1c573da01b45303ad4432e95fd74b52c49fa2b1adf75e13efcad9300ed8aad29",
-                    "mixHash" : "0x51f18e7a1f93119cbe5f635d654d82152e6175e1ab994125819f394ce005ade3",
-                    "nonce" : "0x6d9eb96e305ee3b0",
+                    "gasUsed" : "0x03749b",
+                    "hash" : "0x682b2f68af86fc22e818ad1e9f6cb96ac857bcedc787abf30488f674203f424b",
+                    "mixHash" : "0x72ac93586a33c52cb4c581168e74c36afc2629cbb62d8a6b26e770cf5a27fb9b",
+                    "nonce" : "0x020927f7a6c39570",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x73ffc464b3c71b246e079dec87fc3e85ed52fb232d3aa6abfccceadb47864911",
-                    "stateRoot" : "0xac7d57dd85f91e28659d95ecf95d41284b7d97918e0cf41124399c2d54e9fa77",
+                    "receiptTrie" : "0x2cb2e1f785ede61944be6fb8b22863cc78774178dca89c932fc66bc96d7317df",
+                    "stateRoot" : "0x672c27160ccd3ef565dd42794b8529467c946997850b696d737a05130a433b17",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe593ceb38d6e81b71222c0a2b5c11b4baf519e15e027834fb4805d7d8e2e84d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac7d57dd85f91e28659d95ecf95d41284b7d97918e0cf41124399c2d54e9fa77a0be593ceb38d6e81b71222c0a2b5c11b4baf519e15e027834fb4805d7d8e2e84da073ffc464b3c71b246e079dec87fc3e85ed52fb232d3aa6abfccceadb47864911b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021f888203e880a051f18e7a1f93119cbe5f635d654d82152e6175e1ab994125819f394ce005ade3886d9eb96e305ee3b0f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca068ec1cd3018d1de63a8b6a400552ba4cd19404b0fde8df65f3d0c26f2e6f5199a02ab57e853f25bb84599106b9792978117ce8521e19f5a9be5f4e6ed8a9f61681c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0672c27160ccd3ef565dd42794b8529467c946997850b696d737a05130a433b17a0be593ceb38d6e81b71222c0a2b5c11b4baf519e15e027834fb4805d7d8e2e84da02cb2e1f785ede61944be6fb8b22863cc78774178dca89c932fc66bc96d7317dfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808303749b8203e880a072ac93586a33c52cb4c581168e74c36afc2629cbb62d8a6b26e770cf5a27fb9b88020927f7a6c39570f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca068ec1cd3018d1de63a8b6a400552ba4cd19404b0fde8df65f3d0c26f2e6f5199a02ab57e853f25bb84599106b9792978117ce8521e19f5a9be5f4e6ed8a9f61681c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -882,18 +1101,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1c573da01b45303ad4432e95fd74b52c49fa2b1adf75e13efcad9300ed8aad29",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x682b2f68af86fc22e818ad1e9f6cb96ac857bcedc787abf30488f674203f424b",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f61f88",
+                "balance" : "0x4563918244f7749b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -930,7 +1142,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2f078",
+                "balance" : "0xe8d4a19b65",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g0v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g0v1.json
index ef546d2cc..42b474c37 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g0v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g0v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d1g0v1_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d1g0v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g0v1Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x039917",
-                    "hash" : "0x35ba0787abcb8aeb6b6e98e3f5a30e1921698623c6e2a13959e7bb75c65918fc",
-                    "mixHash" : "0x4a1995dc343d174d3b15bbb30cd4f1b3cc707723209ae17339a23719ce235558",
-                    "nonce" : "0x6e40a4286bb08d9e",
+                    "gasUsed" : "0x0239b4",
+                    "hash" : "0x3df1c82da80de3deffb56e28106171eae6abf22fe3d2b824a0389a2af3089278",
+                    "mixHash" : "0x74987a58b151f18d7336aa4120e9eb9314c56c2ba96b17a232d005fd9d57d363",
+                    "nonce" : "0x46a4c788cb101116",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x77e83b5a07445d59a1059c524a97367df85011f3cb6e1415a22e2aeb4d8f1045",
-                    "stateRoot" : "0x21eab9dbdf303c7e24d4f6bde1447369363194eb32db45f434322e92bcc3ccb8",
+                    "receiptTrie" : "0x2c8982f9884df66f5bff5b9487b808a3115de89765f000b65f769677eaa677cf",
+                    "stateRoot" : "0xe3bb0aceaf57d8b60753a6bfa6ad28bfd71a89bbd6945d4f3be73851e091d298",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe09e23128d0a5318872ff67fb8c6fd8723c92aaf0821eca212ef44cb81c96a44",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021eab9dbdf303c7e24d4f6bde1447369363194eb32db45f434322e92bcc3ccb8a0e09e23128d0a5318872ff67fb8c6fd8723c92aaf0821eca212ef44cb81c96a44a077e83b5a07445d59a1059c524a97367df85011f3cb6e1415a22e2aeb4d8f1045b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830399178203e880a04a1995dc343d174d3b15bbb30cd4f1b3cc707723209ae17339a23719ce235558886e40a4286bb08d9ef882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ba04d21ca1be30dddc2cf808ea3bf327ecfe150e444c43d1abeae9135de2ed2bc31a00da56c0833c3709698349fe328890a2a4e6312ac846659b0225343a4dfa1a8ecc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3bb0aceaf57d8b60753a6bfa6ad28bfd71a89bbd6945d4f3be73851e091d298a0e09e23128d0a5318872ff67fb8c6fd8723c92aaf0821eca212ef44cb81c96a44a02c8982f9884df66f5bff5b9487b808a3115de89765f000b65f769677eaa677cfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239b48203e880a074987a58b151f18d7336aa4120e9eb9314c56c2ba96b17a232d005fd9d57d3638846a4c788cb101116f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ba04d21ca1be30dddc2cf808ea3bf327ecfe150e444c43d1abeae9135de2ed2bc31a00da56c0833c3709698349fe328890a2a4e6312ac846659b0225343a4dfa1a8ecc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x35ba0787abcb8aeb6b6e98e3f5a30e1921698623c6e2a13959e7bb75c65918fc",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3df1c82da80de3deffb56e28106171eae6abf22fe3d2b824a0389a2af3089278",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f79917",
+                "balance" : "0x4563918244f639b4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -103,7 +110,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a176df",
+                "balance" : "0xe8d4a2d642",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -204,10 +211,222 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g0v1_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d1g0v1_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g0v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0239b4",
+                    "hash" : "0x639bfdb81bf610e9927b3d590878c72483a253ce8a86d2766054ef1d02d37e87",
+                    "mixHash" : "0xb1d9a19f3ed86a9f20476d5f749221ba671d8af5533d11f70ce3c0e74cfc5d8f",
+                    "nonce" : "0x6e3cf685c02bff6b",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0x2c8982f9884df66f5bff5b9487b808a3115de89765f000b65f769677eaa677cf",
+                    "stateRoot" : "0xe3bb0aceaf57d8b60753a6bfa6ad28bfd71a89bbd6945d4f3be73851e091d298",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe09e23128d0a5318872ff67fb8c6fd8723c92aaf0821eca212ef44cb81c96a44",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3bb0aceaf57d8b60753a6bfa6ad28bfd71a89bbd6945d4f3be73851e091d298a0e09e23128d0a5318872ff67fb8c6fd8723c92aaf0821eca212ef44cb81c96a44a02c8982f9884df66f5bff5b9487b808a3115de89765f000b65f769677eaa677cfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239b48203e880a0b1d9a19f3ed86a9f20476d5f749221ba671d8af5533d11f70ce3c0e74cfc5d8f886e3cf685c02bff6bf882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ba04d21ca1be30dddc2cf808ea3bf327ecfe150e444c43d1abeae9135de2ed2bc31a00da56c0833c3709698349fe328890a2a4e6312ac846659b0225343a4dfa1a8ecc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
+                        "gasLimit" : "0x0c3500",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4d21ca1be30dddc2cf808ea3bf327ecfe150e444c43d1abeae9135de2ed2bc31",
+                        "s" : "0x0da56c0833c3709698349fe328890a2a4e6312ac846659b0225343a4dfa1a8ec",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x639bfdb81bf610e9927b3d590878c72483a253ce8a86d2766054ef1d02d37e87",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f639b4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x0a",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c"
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2d642",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d1g0v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g0v1Filler.json"
         },
         "blocks" : [
@@ -219,9 +438,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x039917",
-                    "hash" : "0xe2c6c16c62e259262e755ba8eec14758dbafe9dc1b27dd5bef81a4df69b9bc37",
-                    "mixHash" : "0xff3ef7d6a59354c1a7f1ec3155d1bae08c1123047fa795834347db58a3d2e5c1",
-                    "nonce" : "0x7c5f759abea46244",
+                    "hash" : "0x902bd3f776b5acfb16f13378749821bb28401cbe88e3d5ad9dbb4e8ab18c6db3",
+                    "mixHash" : "0x7ee613a83ddf44ea3e9b783f3f989d9d9c28cfc78bbdd9c43f8388ebf67756b1",
+                    "nonce" : "0xfb4df05000b23ba0",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x77e83b5a07445d59a1059c524a97367df85011f3cb6e1415a22e2aeb4d8f1045",
@@ -230,7 +449,7 @@
                     "transactionsTrie" : "0xe09e23128d0a5318872ff67fb8c6fd8723c92aaf0821eca212ef44cb81c96a44",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021eab9dbdf303c7e24d4f6bde1447369363194eb32db45f434322e92bcc3ccb8a0e09e23128d0a5318872ff67fb8c6fd8723c92aaf0821eca212ef44cb81c96a44a077e83b5a07445d59a1059c524a97367df85011f3cb6e1415a22e2aeb4d8f1045b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830399178203e880a0ff3ef7d6a59354c1a7f1ec3155d1bae08c1123047fa795834347db58a3d2e5c1887c5f759abea46244f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ba04d21ca1be30dddc2cf808ea3bf327ecfe150e444c43d1abeae9135de2ed2bc31a00da56c0833c3709698349fe328890a2a4e6312ac846659b0225343a4dfa1a8ecc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021eab9dbdf303c7e24d4f6bde1447369363194eb32db45f434322e92bcc3ccb8a0e09e23128d0a5318872ff67fb8c6fd8723c92aaf0821eca212ef44cb81c96a44a077e83b5a07445d59a1059c524a97367df85011f3cb6e1415a22e2aeb4d8f1045b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830399178203e880a07ee613a83ddf44ea3e9b783f3f989d9d9c28cfc78bbdd9c43f8388ebf67756b188fb4df05000b23ba0f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ba04d21ca1be30dddc2cf808ea3bf327ecfe150e444c43d1abeae9135de2ed2bc31a00da56c0833c3709698349fe328890a2a4e6312ac846659b0225343a4dfa1a8ecc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -267,8 +486,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe2c6c16c62e259262e755ba8eec14758dbafe9dc1b27dd5bef81a4df69b9bc37",
-        "network" : "EIP158",
+        "lastblockhash" : "0x902bd3f776b5acfb16f13378749821bb28401cbe88e3d5ad9dbb4e8ab18c6db3",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f79917",
@@ -409,10 +628,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g0v1_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d1g0v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g0v1Filler.json"
         },
         "blocks" : [
@@ -423,19 +642,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x038ec7",
-                    "hash" : "0x843541c08a40daa75ff102b0790b1d5e175bee8981c7fdeddd52323487a3a3fa",
-                    "mixHash" : "0xa932374404887191d5082ca4b24a291b205e1d7831d894430b7e55e190305c91",
-                    "nonce" : "0x722fa3025369b84a",
+                    "gasUsed" : "0x039917",
+                    "hash" : "0xd22384ce1e9e8054886cc3897dae3a0e9072d016d47d1b56b21deff821fcb9da",
+                    "mixHash" : "0x8010e95b5265ad01792bd6266ac463ffb578925441a760fb6bc7849a7af32540",
+                    "nonce" : "0x2ff8c96f7ff4d83f",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xaaea84ea3bfe05118aa2bb4bcd23051026f39ab68859eb22c0018949b6bcb511",
-                    "stateRoot" : "0x330096448da514e65c46c678f6a07430987812ff43e3bcede5ad87e8258d6c71",
+                    "receiptTrie" : "0x77e83b5a07445d59a1059c524a97367df85011f3cb6e1415a22e2aeb4d8f1045",
+                    "stateRoot" : "0x21eab9dbdf303c7e24d4f6bde1447369363194eb32db45f434322e92bcc3ccb8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe09e23128d0a5318872ff67fb8c6fd8723c92aaf0821eca212ef44cb81c96a44",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0330096448da514e65c46c678f6a07430987812ff43e3bcede5ad87e8258d6c71a0e09e23128d0a5318872ff67fb8c6fd8723c92aaf0821eca212ef44cb81c96a44a0aaea84ea3bfe05118aa2bb4bcd23051026f39ab68859eb22c0018949b6bcb511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083038ec78203e880a0a932374404887191d5082ca4b24a291b205e1d7831d894430b7e55e190305c9188722fa3025369b84af882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ba04d21ca1be30dddc2cf808ea3bf327ecfe150e444c43d1abeae9135de2ed2bc31a00da56c0833c3709698349fe328890a2a4e6312ac846659b0225343a4dfa1a8ecc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021eab9dbdf303c7e24d4f6bde1447369363194eb32db45f434322e92bcc3ccb8a0e09e23128d0a5318872ff67fb8c6fd8723c92aaf0821eca212ef44cb81c96a44a077e83b5a07445d59a1059c524a97367df85011f3cb6e1415a22e2aeb4d8f1045b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830399178203e880a08010e95b5265ad01792bd6266ac463ffb578925441a760fb6bc7849a7af32540882ff8c96f7ff4d83ff882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ba04d21ca1be30dddc2cf808ea3bf327ecfe150e444c43d1abeae9135de2ed2bc31a00da56c0833c3709698349fe328890a2a4e6312ac846659b0225343a4dfa1a8ecc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -472,11 +691,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x843541c08a40daa75ff102b0790b1d5e175bee8981c7fdeddd52323487a3a3fa",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd22384ce1e9e8054886cc3897dae3a0e9072d016d47d1b56b21deff821fcb9da",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f78ec7",
+                "balance" : "0x4563918244f79917",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -513,7 +732,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a1812f",
+                "balance" : "0xe8d4a176df",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -614,10 +833,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g0v1_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d1g0v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g0v1Filler.json"
         },
         "blocks" : [
@@ -629,9 +848,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x038ec7",
-                    "hash" : "0xcf2a7f233987059ab7e514aa7ba6e61e710fb0a61f22fe77401bc9444307f07e",
-                    "mixHash" : "0x16de5f74a2f93e06454c3614eb3f1857c13ef9f93c7d78360858bdd732a55d7e",
-                    "nonce" : "0x24ac1b2320eb9888",
+                    "hash" : "0x8ebe3c1b3379139a5943f51be0e535a09fdcf422c1bf7cc5ca730126a45761b8",
+                    "mixHash" : "0x85c90a82aebeb1941ddde352ee063bf2b493d38a7456cf6edfd3e8e7c179f4cb",
+                    "nonce" : "0x66d754a76f722d29",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xaaea84ea3bfe05118aa2bb4bcd23051026f39ab68859eb22c0018949b6bcb511",
@@ -640,7 +859,7 @@
                     "transactionsTrie" : "0xe09e23128d0a5318872ff67fb8c6fd8723c92aaf0821eca212ef44cb81c96a44",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0330096448da514e65c46c678f6a07430987812ff43e3bcede5ad87e8258d6c71a0e09e23128d0a5318872ff67fb8c6fd8723c92aaf0821eca212ef44cb81c96a44a0aaea84ea3bfe05118aa2bb4bcd23051026f39ab68859eb22c0018949b6bcb511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083038ec78203e880a016de5f74a2f93e06454c3614eb3f1857c13ef9f93c7d78360858bdd732a55d7e8824ac1b2320eb9888f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ba04d21ca1be30dddc2cf808ea3bf327ecfe150e444c43d1abeae9135de2ed2bc31a00da56c0833c3709698349fe328890a2a4e6312ac846659b0225343a4dfa1a8ecc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0330096448da514e65c46c678f6a07430987812ff43e3bcede5ad87e8258d6c71a0e09e23128d0a5318872ff67fb8c6fd8723c92aaf0821eca212ef44cb81c96a44a0aaea84ea3bfe05118aa2bb4bcd23051026f39ab68859eb22c0018949b6bcb511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083038ec78203e880a085c90a82aebeb1941ddde352ee063bf2b493d38a7456cf6edfd3e8e7c179f4cb8866d754a76f722d29f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ba04d21ca1be30dddc2cf808ea3bf327ecfe150e444c43d1abeae9135de2ed2bc31a00da56c0833c3709698349fe328890a2a4e6312ac846659b0225343a4dfa1a8ecc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -677,8 +896,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf2a7f233987059ab7e514aa7ba6e61e710fb0a61f22fe77401bc9444307f07e",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8ebe3c1b3379139a5943f51be0e535a09fdcf422c1bf7cc5ca730126a45761b8",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f78ec7",
@@ -819,10 +1038,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g0v1_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d1g0v1_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g0v1Filler.json"
         },
         "blocks" : [
@@ -833,19 +1052,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0239b4",
-                    "hash" : "0xc7a3f922bbffbc7e91014f25072f9fe47314ea43ed20ead92e8d91d24fe28e12",
-                    "mixHash" : "0x5a960bc261d0c026ce86dc98ae1a93f8ba42d807dfb5b65a2fd434034e2f9ff9",
-                    "nonce" : "0xe6cc21d6d0870c61",
+                    "gasUsed" : "0x038ec7",
+                    "hash" : "0xab225ffdf62ca708a364503131da4672b441f36cbd77b787bb0c3936c8b00d0c",
+                    "mixHash" : "0x0502cdf28f2aca9f0261e6030d393abbe1acd78ca04b2e2ba45814cf80af9dcc",
+                    "nonce" : "0x8a6b838419ed36cb",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x2c8982f9884df66f5bff5b9487b808a3115de89765f000b65f769677eaa677cf",
-                    "stateRoot" : "0xe3bb0aceaf57d8b60753a6bfa6ad28bfd71a89bbd6945d4f3be73851e091d298",
+                    "receiptTrie" : "0xaaea84ea3bfe05118aa2bb4bcd23051026f39ab68859eb22c0018949b6bcb511",
+                    "stateRoot" : "0x330096448da514e65c46c678f6a07430987812ff43e3bcede5ad87e8258d6c71",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe09e23128d0a5318872ff67fb8c6fd8723c92aaf0821eca212ef44cb81c96a44",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3bb0aceaf57d8b60753a6bfa6ad28bfd71a89bbd6945d4f3be73851e091d298a0e09e23128d0a5318872ff67fb8c6fd8723c92aaf0821eca212ef44cb81c96a44a02c8982f9884df66f5bff5b9487b808a3115de89765f000b65f769677eaa677cfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239b48203e880a05a960bc261d0c026ce86dc98ae1a93f8ba42d807dfb5b65a2fd434034e2f9ff988e6cc21d6d0870c61f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ba04d21ca1be30dddc2cf808ea3bf327ecfe150e444c43d1abeae9135de2ed2bc31a00da56c0833c3709698349fe328890a2a4e6312ac846659b0225343a4dfa1a8ecc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0330096448da514e65c46c678f6a07430987812ff43e3bcede5ad87e8258d6c71a0e09e23128d0a5318872ff67fb8c6fd8723c92aaf0821eca212ef44cb81c96a44a0aaea84ea3bfe05118aa2bb4bcd23051026f39ab68859eb22c0018949b6bcb511b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083038ec78203e880a00502cdf28f2aca9f0261e6030d393abbe1acd78ca04b2e2ba45814cf80af9dcc888a6b838419ed36cbf882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ba04d21ca1be30dddc2cf808ea3bf327ecfe150e444c43d1abeae9135de2ed2bc31a00da56c0833c3709698349fe328890a2a4e6312ac846659b0225343a4dfa1a8ecc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -882,18 +1101,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc7a3f922bbffbc7e91014f25072f9fe47314ea43ed20ead92e8d91d24fe28e12",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xab225ffdf62ca708a364503131da4672b441f36cbd77b787bb0c3936c8b00d0c",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f639b4",
+                "balance" : "0x4563918244f78ec7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -930,7 +1142,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2d642",
+                "balance" : "0xe8d4a1812f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g1v0.json
index 4262906bb..32229bd73 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d1g1v0_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d1g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x021bab",
-                    "hash" : "0x61bfc4349390943096902cfaf9121b34428e909b6c0086821c54ee73db921d13",
-                    "mixHash" : "0xa9cd88dbe3f8e97d9c48c197d4574399d52deef168eb70976c90c42f2ae5e1f3",
-                    "nonce" : "0xfb76be36c21b9f12",
+                    "hash" : "0x95b4b487fea66e2e9cefa0d7ff947dd6b5157ed3c549a881e9f2bfb19034f3c4",
+                    "mixHash" : "0x10f588d1cf59cf6250c23d333a9e3a2af0d1be9df4a7be4be4fa03a118e7eba7",
+                    "nonce" : "0x99b5d87ae716bc48",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248",
-                    "stateRoot" : "0xa27bd406ba7bfcfa53658aeb61745209354cfd1bf2e7b109f3d0e505239cf53d",
+                    "receiptTrie" : "0x53676617105e409ad2fa2ca6c10cff34c7e103bb501f2af60fd65b5311754d2c",
+                    "stateRoot" : "0x8964f2826c5f39086e6c7bde2870c0c9ceb501008c4794d50dcea2e485ec7013",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x854f635614102701407cb2352f829cc85bb5c130d12d9ba24ec01f3015e7e263",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a27bd406ba7bfcfa53658aeb61745209354cfd1bf2e7b109f3d0e505239cf53da0854f635614102701407cb2352f829cc85bb5c130d12d9ba24ec01f3015e7e263a0974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a0a9cd88dbe3f8e97d9c48c197d4574399d52deef168eb70976c90c42f2ae5e1f388fb76be36c21b9f12f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca0e033e5a23575d3a3d1e764735dd5ee0222ecbf6be9a5f5e1e1f8d03d97500f87a009d7ac94908bfa87f31f5f0322caabe6509bde1b310870943967eab5d172fd15c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08964f2826c5f39086e6c7bde2870c0c9ceb501008c4794d50dcea2e485ec7013a0854f635614102701407cb2352f829cc85bb5c130d12d9ba24ec01f3015e7e263a053676617105e409ad2fa2ca6c10cff34c7e103bb501f2af60fd65b5311754d2cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a010f588d1cf59cf6250c23d333a9e3a2af0d1be9df4a7be4be4fa03a118e7eba78899b5d87ae716bc48f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca0e033e5a23575d3a3d1e764735dd5ee0222ecbf6be9a5f5e1e1f8d03d97500f87a009d7ac94908bfa87f31f5f0322caabe6509bde1b310870943967eab5d172fd15c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x61bfc4349390943096902cfaf9121b34428e909b6c0086821c54ee73db921d13",
-        "network" : "EIP150",
+        "lastblockhash" : "0x95b4b487fea66e2e9cefa0d7ff947dd6b5157ed3c549a881e9f2bfb19034f3c4",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f61bab",
                 "code" : "",
@@ -202,10 +209,220 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g1v0_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d1g1v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x021bab",
+                    "hash" : "0x8bfe0c2159233dc1fce2301230b34dbe27827f44f858cbb9301401374e30f099",
+                    "mixHash" : "0x8c519c29ab4ee9bb36217e84872503aab8e5a12495c9c551d9a7a323ffa94ecb",
+                    "nonce" : "0x7537466df4cf7321",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0x53676617105e409ad2fa2ca6c10cff34c7e103bb501f2af60fd65b5311754d2c",
+                    "stateRoot" : "0x8964f2826c5f39086e6c7bde2870c0c9ceb501008c4794d50dcea2e485ec7013",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x854f635614102701407cb2352f829cc85bb5c130d12d9ba24ec01f3015e7e263",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08964f2826c5f39086e6c7bde2870c0c9ceb501008c4794d50dcea2e485ec7013a0854f635614102701407cb2352f829cc85bb5c130d12d9ba24ec01f3015e7e263a053676617105e409ad2fa2ca6c10cff34c7e103bb501f2af60fd65b5311754d2cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a08c519c29ab4ee9bb36217e84872503aab8e5a12495c9c551d9a7a323ffa94ecb887537466df4cf7321f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca0e033e5a23575d3a3d1e764735dd5ee0222ecbf6be9a5f5e1e1f8d03d97500f87a009d7ac94908bfa87f31f5f0322caabe6509bde1b310870943967eab5d172fd15c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
+                        "gasLimit" : "0x0222e0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe033e5a23575d3a3d1e764735dd5ee0222ecbf6be9a5f5e1e1f8d03d97500f87",
+                        "s" : "0x09d7ac94908bfa87f31f5f0322caabe6509bde1b310870943967eab5d172fd15",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8bfe0c2159233dc1fce2301230b34dbe27827f44f858cbb9301401374e30f099",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f61bab",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2f455",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d1g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -217,9 +434,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x021bab",
-                    "hash" : "0xb2f0a771bc365c6c55ce8a8162dbe8f7d6e4ec4338eb5f9222bc5916709a580c",
-                    "mixHash" : "0x7597dd52ba8ba20abb791d4873203eeb1e85a05a20540cdda226170e566022af",
-                    "nonce" : "0x0af658901cb0d1ad",
+                    "hash" : "0xa7621285affcc7ac916cd5fc6c29eede0a0aa92c75d742a8d8386a8d34be401d",
+                    "mixHash" : "0xfe2b303e55a4ab1054f3e9866320080ad5c9092645a0d0fabc243bafed6b4304",
+                    "nonce" : "0x59eeed92b784dac2",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248",
@@ -228,7 +445,7 @@
                     "transactionsTrie" : "0x854f635614102701407cb2352f829cc85bb5c130d12d9ba24ec01f3015e7e263",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a27bd406ba7bfcfa53658aeb61745209354cfd1bf2e7b109f3d0e505239cf53da0854f635614102701407cb2352f829cc85bb5c130d12d9ba24ec01f3015e7e263a0974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a07597dd52ba8ba20abb791d4873203eeb1e85a05a20540cdda226170e566022af880af658901cb0d1adf882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca0e033e5a23575d3a3d1e764735dd5ee0222ecbf6be9a5f5e1e1f8d03d97500f87a009d7ac94908bfa87f31f5f0322caabe6509bde1b310870943967eab5d172fd15c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a27bd406ba7bfcfa53658aeb61745209354cfd1bf2e7b109f3d0e505239cf53da0854f635614102701407cb2352f829cc85bb5c130d12d9ba24ec01f3015e7e263a0974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a0fe2b303e55a4ab1054f3e9866320080ad5c9092645a0d0fabc243bafed6b43048859eeed92b784dac2f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca0e033e5a23575d3a3d1e764735dd5ee0222ecbf6be9a5f5e1e1f8d03d97500f87a009d7ac94908bfa87f31f5f0322caabe6509bde1b310870943967eab5d172fd15c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -265,8 +482,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb2f0a771bc365c6c55ce8a8162dbe8f7d6e4ec4338eb5f9222bc5916709a580c",
-        "network" : "EIP158",
+        "lastblockhash" : "0xa7621285affcc7ac916cd5fc6c29eede0a0aa92c75d742a8d8386a8d34be401d",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f61bab",
@@ -405,10 +622,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g1v0_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d1g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -419,19 +636,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0222e0",
-                    "hash" : "0xeeb753046e8e3fe98d5a835803ac9dda449b1f6ae6e72d506fec449f8065a875",
-                    "mixHash" : "0xfc5c7005b91dc44e61bde66aeeaf42dc5fe785b5796b6517eb28590ab8f9ecac",
-                    "nonce" : "0x9d9893ea470b079e",
+                    "gasUsed" : "0x021bab",
+                    "hash" : "0xedddddb29d3c6e06b0f50f56fe38b9953309f0d0bf50e7b638a84acb179c9e60",
+                    "mixHash" : "0x5a7f0062b4ad76c608b1dfac502b4973c0de0b4c1bb3af8deca75e0b8892f283",
+                    "nonce" : "0x8a82f99cea9017d6",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x4127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705",
-                    "stateRoot" : "0x4a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474c",
+                    "receiptTrie" : "0x974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248",
+                    "stateRoot" : "0xa27bd406ba7bfcfa53658aeb61745209354cfd1bf2e7b109f3d0e505239cf53d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x854f635614102701407cb2352f829cc85bb5c130d12d9ba24ec01f3015e7e263",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca0854f635614102701407cb2352f829cc85bb5c130d12d9ba24ec01f3015e7e263a04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a0fc5c7005b91dc44e61bde66aeeaf42dc5fe785b5796b6517eb28590ab8f9ecac889d9893ea470b079ef882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca0e033e5a23575d3a3d1e764735dd5ee0222ecbf6be9a5f5e1e1f8d03d97500f87a009d7ac94908bfa87f31f5f0322caabe6509bde1b310870943967eab5d172fd15c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a27bd406ba7bfcfa53658aeb61745209354cfd1bf2e7b109f3d0e505239cf53da0854f635614102701407cb2352f829cc85bb5c130d12d9ba24ec01f3015e7e263a0974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a05a7f0062b4ad76c608b1dfac502b4973c0de0b4c1bb3af8deca75e0b8892f283888a82f99cea9017d6f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca0e033e5a23575d3a3d1e764735dd5ee0222ecbf6be9a5f5e1e1f8d03d97500f87a009d7ac94908bfa87f31f5f0322caabe6509bde1b310870943967eab5d172fd15c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -468,11 +685,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeeb753046e8e3fe98d5a835803ac9dda449b1f6ae6e72d506fec449f8065a875",
-        "network" : "Frontier",
+        "lastblockhash" : "0xedddddb29d3c6e06b0f50f56fe38b9953309f0d0bf50e7b638a84acb179c9e60",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f622e0",
+                "balance" : "0x4563918244f61bab",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,7 +724,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2ed20",
+                "balance" : "0xe8d4a2f455",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -608,10 +825,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g1v0_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d1g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -623,9 +840,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0222e0",
-                    "hash" : "0xff38e1c4192be8e0816ed9ec9076e12e81a4f793b4003d2491f81a3fc89625b2",
-                    "mixHash" : "0x6fbf2c21d93bd4b96ff7fa5340bf1947a4957ac042e1ef2f01f8cbdda69fdc66",
-                    "nonce" : "0x085c97dcddd0a71d",
+                    "hash" : "0x1932d475cb558eb5dffb29b53136494422bab73f8320e362de3cac76c6630b24",
+                    "mixHash" : "0x00ba57663f4aff7800b5d50dfc6b40157edf0920807007ae97c856d71612c8e1",
+                    "nonce" : "0x93f228a2e0470d92",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x4127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705",
@@ -634,7 +851,7 @@
                     "transactionsTrie" : "0x854f635614102701407cb2352f829cc85bb5c130d12d9ba24ec01f3015e7e263",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca0854f635614102701407cb2352f829cc85bb5c130d12d9ba24ec01f3015e7e263a04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a06fbf2c21d93bd4b96ff7fa5340bf1947a4957ac042e1ef2f01f8cbdda69fdc6688085c97dcddd0a71df882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca0e033e5a23575d3a3d1e764735dd5ee0222ecbf6be9a5f5e1e1f8d03d97500f87a009d7ac94908bfa87f31f5f0322caabe6509bde1b310870943967eab5d172fd15c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca0854f635614102701407cb2352f829cc85bb5c130d12d9ba24ec01f3015e7e263a04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a000ba57663f4aff7800b5d50dfc6b40157edf0920807007ae97c856d71612c8e18893f228a2e0470d92f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca0e033e5a23575d3a3d1e764735dd5ee0222ecbf6be9a5f5e1e1f8d03d97500f87a009d7ac94908bfa87f31f5f0322caabe6509bde1b310870943967eab5d172fd15c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -671,8 +888,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xff38e1c4192be8e0816ed9ec9076e12e81a4f793b4003d2491f81a3fc89625b2",
-        "network" : "Homestead",
+        "lastblockhash" : "0x1932d475cb558eb5dffb29b53136494422bab73f8320e362de3cac76c6630b24",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f622e0",
@@ -811,10 +1028,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g1v0_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d1g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -825,19 +1042,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x021bab",
-                    "hash" : "0xf1aa68e30002ad99980d7bb760508ce95949a4b64023b838a3f202f6afa68fd1",
-                    "mixHash" : "0xdeb33b88ac26d5ca5d46211479f786f861274891c11ade0a5f39da1a68a4e080",
-                    "nonce" : "0xb542b30f69034fb7",
+                    "gasUsed" : "0x0222e0",
+                    "hash" : "0xde1306a18652d42e056b56a1c36f1533c97c3d5620f0c5f87739ee1a2d02b4dd",
+                    "mixHash" : "0x671285e41bd868309ef26e8b107227c19f9b60675bcae548cf0d6ba81bb6362a",
+                    "nonce" : "0x9f460a71c049c4a8",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x53676617105e409ad2fa2ca6c10cff34c7e103bb501f2af60fd65b5311754d2c",
-                    "stateRoot" : "0x8964f2826c5f39086e6c7bde2870c0c9ceb501008c4794d50dcea2e485ec7013",
+                    "receiptTrie" : "0x4127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705",
+                    "stateRoot" : "0x4a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x854f635614102701407cb2352f829cc85bb5c130d12d9ba24ec01f3015e7e263",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08964f2826c5f39086e6c7bde2870c0c9ceb501008c4794d50dcea2e485ec7013a0854f635614102701407cb2352f829cc85bb5c130d12d9ba24ec01f3015e7e263a053676617105e409ad2fa2ca6c10cff34c7e103bb501f2af60fd65b5311754d2cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a0deb33b88ac26d5ca5d46211479f786f861274891c11ade0a5f39da1a68a4e08088b542b30f69034fb7f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca0e033e5a23575d3a3d1e764735dd5ee0222ecbf6be9a5f5e1e1f8d03d97500f87a009d7ac94908bfa87f31f5f0322caabe6509bde1b310870943967eab5d172fd15c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca0854f635614102701407cb2352f829cc85bb5c130d12d9ba24ec01f3015e7e263a04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a0671285e41bd868309ef26e8b107227c19f9b60675bcae548cf0d6ba81bb6362a889f460a71c049c4a8f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca0e033e5a23575d3a3d1e764735dd5ee0222ecbf6be9a5f5e1e1f8d03d97500f87a009d7ac94908bfa87f31f5f0322caabe6509bde1b310870943967eab5d172fd15c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -874,18 +1091,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf1aa68e30002ad99980d7bb760508ce95949a4b64023b838a3f202f6afa68fd1",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xde1306a18652d42e056b56a1c36f1533c97c3d5620f0c5f87739ee1a2d02b4dd",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f61bab",
+                "balance" : "0x4563918244f622e0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -920,7 +1130,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2f455",
+                "balance" : "0xe8d4a2ed20",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g1v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g1v1.json
index 8f9c3d851..df92e2a55 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g1v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g1v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d1g1v1_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d1g1v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g1v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x021c38",
-                    "hash" : "0x2cb7402b50854c91ff2e73173ab1c6c4c7acb388d6b0ac8272274df9be8bf425",
-                    "mixHash" : "0xd426cc791b31485f9e347525b02a8d5f38d5e7df7a58040f6032cc4f433a77bc",
-                    "nonce" : "0xe6c3517341dcfb80",
+                    "hash" : "0x696bbc8c4adca128334260acd637c59f4713b1fb379c14abf22c6a165be039dc",
+                    "mixHash" : "0xadc06888d64743ad48095f18307f12b5b95f339cb8626578080c779353e971f6",
+                    "nonce" : "0xfb32f47f202caee4",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x4569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347",
-                    "stateRoot" : "0x3c1d230a551485cf88053ae87b45605c9aef43f470d13df126fe6ae8beb5fcb0",
+                    "receiptTrie" : "0x24d2d186ab09293dbc34b96a81c4c5b17ca8ffcaf089fac761837eb4295292ce",
+                    "stateRoot" : "0xce4e66c72c075a0f93843f269406dbe35dcdcc3f047d9739dc77ad2e3500bbfe",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6a41539b2c1309117fd1a773ee26e486e94fa9223118a393cdb359780aab8ea5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c1d230a551485cf88053ae87b45605c9aef43f470d13df126fe6ae8beb5fcb0a06a41539b2c1309117fd1a773ee26e486e94fa9223118a393cdb359780aab8ea5a04569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a0d426cc791b31485f9e347525b02a8d5f38d5e7df7a58040f6032cc4f433a77bc88e6c3517341dcfb80f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca0ccbff1085912056dce32aa4f32dd72efed1f05fc8fd0315e2eec212dbdb7aef0a032bd71f772e670eec9325ea1da4c6ccd6f5723ec81877461d81650cfc87cb55ac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ce4e66c72c075a0f93843f269406dbe35dcdcc3f047d9739dc77ad2e3500bbfea06a41539b2c1309117fd1a773ee26e486e94fa9223118a393cdb359780aab8ea5a024d2d186ab09293dbc34b96a81c4c5b17ca8ffcaf089fac761837eb4295292ceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a0adc06888d64743ad48095f18307f12b5b95f339cb8626578080c779353e971f688fb32f47f202caee4f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca0ccbff1085912056dce32aa4f32dd72efed1f05fc8fd0315e2eec212dbdb7aef0a032bd71f772e670eec9325ea1da4c6ccd6f5723ec81877461d81650cfc87cb55ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2cb7402b50854c91ff2e73173ab1c6c4c7acb388d6b0ac8272274df9be8bf425",
-        "network" : "EIP150",
+        "lastblockhash" : "0x696bbc8c4adca128334260acd637c59f4713b1fb379c14abf22c6a165be039dc",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f61c38",
                 "code" : "",
@@ -202,10 +209,220 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g1v1_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d1g1v1_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g1v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x021c38",
+                    "hash" : "0xbf85e7b0f7ea8cd12cca860ebefc68d4d97c71e420778558fa6b9a688595a8fe",
+                    "mixHash" : "0x4b51e196a3bace73034a0908f639c5e5838e18c4da7112e532525ecbf6a61736",
+                    "nonce" : "0x58ef1e7dfb18a880",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0x24d2d186ab09293dbc34b96a81c4c5b17ca8ffcaf089fac761837eb4295292ce",
+                    "stateRoot" : "0xce4e66c72c075a0f93843f269406dbe35dcdcc3f047d9739dc77ad2e3500bbfe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6a41539b2c1309117fd1a773ee26e486e94fa9223118a393cdb359780aab8ea5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ce4e66c72c075a0f93843f269406dbe35dcdcc3f047d9739dc77ad2e3500bbfea06a41539b2c1309117fd1a773ee26e486e94fa9223118a393cdb359780aab8ea5a024d2d186ab09293dbc34b96a81c4c5b17ca8ffcaf089fac761837eb4295292ceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a04b51e196a3bace73034a0908f639c5e5838e18c4da7112e532525ecbf6a617368858ef1e7dfb18a880f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca0ccbff1085912056dce32aa4f32dd72efed1f05fc8fd0315e2eec212dbdb7aef0a032bd71f772e670eec9325ea1da4c6ccd6f5723ec81877461d81650cfc87cb55ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
+                        "gasLimit" : "0x0222e0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xccbff1085912056dce32aa4f32dd72efed1f05fc8fd0315e2eec212dbdb7aef0",
+                        "s" : "0x32bd71f772e670eec9325ea1da4c6ccd6f5723ec81877461d81650cfc87cb55a",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbf85e7b0f7ea8cd12cca860ebefc68d4d97c71e420778558fa6b9a688595a8fe",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f61c38",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2f3be",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x0a",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d1g1v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g1v1Filler.json"
         },
         "blocks" : [
@@ -217,9 +434,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x021c38",
-                    "hash" : "0x434f7c68aa20599225a424d74c9b0a38c73c295e7a8efc8c075ecfef33ab5c2a",
-                    "mixHash" : "0x20206d6e07d8fc931fc9e2228c7b3927a3aa4f082e51d405ee2a27a95bdc0add",
-                    "nonce" : "0x6388f49f2707563b",
+                    "hash" : "0xf634f31536746cb7fe30470047edb1236cb11580b678f961bb6258b119283316",
+                    "mixHash" : "0xd1fa8f16c4763c92ed7bde4c2b698cccf68a33ceee54b6d26bf660b284fa54e5",
+                    "nonce" : "0xecc09b00f5dfcad5",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x4569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347",
@@ -228,7 +445,7 @@
                     "transactionsTrie" : "0x6a41539b2c1309117fd1a773ee26e486e94fa9223118a393cdb359780aab8ea5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c1d230a551485cf88053ae87b45605c9aef43f470d13df126fe6ae8beb5fcb0a06a41539b2c1309117fd1a773ee26e486e94fa9223118a393cdb359780aab8ea5a04569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a020206d6e07d8fc931fc9e2228c7b3927a3aa4f082e51d405ee2a27a95bdc0add886388f49f2707563bf882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca0ccbff1085912056dce32aa4f32dd72efed1f05fc8fd0315e2eec212dbdb7aef0a032bd71f772e670eec9325ea1da4c6ccd6f5723ec81877461d81650cfc87cb55ac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c1d230a551485cf88053ae87b45605c9aef43f470d13df126fe6ae8beb5fcb0a06a41539b2c1309117fd1a773ee26e486e94fa9223118a393cdb359780aab8ea5a04569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a0d1fa8f16c4763c92ed7bde4c2b698cccf68a33ceee54b6d26bf660b284fa54e588ecc09b00f5dfcad5f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca0ccbff1085912056dce32aa4f32dd72efed1f05fc8fd0315e2eec212dbdb7aef0a032bd71f772e670eec9325ea1da4c6ccd6f5723ec81877461d81650cfc87cb55ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -265,8 +482,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x434f7c68aa20599225a424d74c9b0a38c73c295e7a8efc8c075ecfef33ab5c2a",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf634f31536746cb7fe30470047edb1236cb11580b678f961bb6258b119283316",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f61c38",
@@ -405,10 +622,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g1v1_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d1g1v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g1v1Filler.json"
         },
         "blocks" : [
@@ -419,19 +636,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0222e0",
-                    "hash" : "0xba9e3b87f7479905e9a337a70837de562abedea6a71f389a1d8a70a07d079296",
-                    "mixHash" : "0xefe3bd4fd06a2badfb43d9c99d4eeab1c771c6a17db0fb85f1275772b3315945",
-                    "nonce" : "0xe21266497a0f8422",
+                    "gasUsed" : "0x021c38",
+                    "hash" : "0x80fc42d7dd69a0319715ac110350f37079c1d4f92b0d0984eb42284eeb6ec6ff",
+                    "mixHash" : "0x6e3256da1e63ff6175c418a915b757045b6d0eb566c91b480c0d93ee13efd598",
+                    "nonce" : "0x2081b66aff7c658d",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x4127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705",
-                    "stateRoot" : "0x4a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474c",
+                    "receiptTrie" : "0x4569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347",
+                    "stateRoot" : "0x3c1d230a551485cf88053ae87b45605c9aef43f470d13df126fe6ae8beb5fcb0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6a41539b2c1309117fd1a773ee26e486e94fa9223118a393cdb359780aab8ea5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca06a41539b2c1309117fd1a773ee26e486e94fa9223118a393cdb359780aab8ea5a04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a0efe3bd4fd06a2badfb43d9c99d4eeab1c771c6a17db0fb85f1275772b331594588e21266497a0f8422f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca0ccbff1085912056dce32aa4f32dd72efed1f05fc8fd0315e2eec212dbdb7aef0a032bd71f772e670eec9325ea1da4c6ccd6f5723ec81877461d81650cfc87cb55ac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c1d230a551485cf88053ae87b45605c9aef43f470d13df126fe6ae8beb5fcb0a06a41539b2c1309117fd1a773ee26e486e94fa9223118a393cdb359780aab8ea5a04569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a06e3256da1e63ff6175c418a915b757045b6d0eb566c91b480c0d93ee13efd598882081b66aff7c658df882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca0ccbff1085912056dce32aa4f32dd72efed1f05fc8fd0315e2eec212dbdb7aef0a032bd71f772e670eec9325ea1da4c6ccd6f5723ec81877461d81650cfc87cb55ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -468,11 +685,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xba9e3b87f7479905e9a337a70837de562abedea6a71f389a1d8a70a07d079296",
-        "network" : "Frontier",
+        "lastblockhash" : "0x80fc42d7dd69a0319715ac110350f37079c1d4f92b0d0984eb42284eeb6ec6ff",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f622e0",
+                "balance" : "0x4563918244f61c38",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,14 +724,14 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2ed20",
+                "balance" : "0xe8d4a2f3be",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
-                "balance" : "0x00",
+                "balance" : "0x0a",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
@@ -608,10 +825,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g1v1_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d1g1v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g1v1Filler.json"
         },
         "blocks" : [
@@ -623,9 +840,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0222e0",
-                    "hash" : "0x710cc87a3019aad28d767c2755170a29883bba727f2a307295a38a9bec9a3a5e",
-                    "mixHash" : "0x61e566307a96b0b6e0988145273a8e26fb58f782f0402002e22ef2406013bad4",
-                    "nonce" : "0xb43c1143e743e64f",
+                    "hash" : "0xf31dc2458a09cc1b4e63268db7b3c67e67dd82a4af593627d7a5dc32a0c2f73f",
+                    "mixHash" : "0x5ff6394b812dc154e115ba0b934743f1388e8d0c98830a245588518645431bd8",
+                    "nonce" : "0xd8fe3d1142c3f63b",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x4127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705",
@@ -634,7 +851,7 @@
                     "transactionsTrie" : "0x6a41539b2c1309117fd1a773ee26e486e94fa9223118a393cdb359780aab8ea5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca06a41539b2c1309117fd1a773ee26e486e94fa9223118a393cdb359780aab8ea5a04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a061e566307a96b0b6e0988145273a8e26fb58f782f0402002e22ef2406013bad488b43c1143e743e64ff882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca0ccbff1085912056dce32aa4f32dd72efed1f05fc8fd0315e2eec212dbdb7aef0a032bd71f772e670eec9325ea1da4c6ccd6f5723ec81877461d81650cfc87cb55ac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca06a41539b2c1309117fd1a773ee26e486e94fa9223118a393cdb359780aab8ea5a04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a05ff6394b812dc154e115ba0b934743f1388e8d0c98830a245588518645431bd888d8fe3d1142c3f63bf882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca0ccbff1085912056dce32aa4f32dd72efed1f05fc8fd0315e2eec212dbdb7aef0a032bd71f772e670eec9325ea1da4c6ccd6f5723ec81877461d81650cfc87cb55ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -671,8 +888,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x710cc87a3019aad28d767c2755170a29883bba727f2a307295a38a9bec9a3a5e",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf31dc2458a09cc1b4e63268db7b3c67e67dd82a4af593627d7a5dc32a0c2f73f",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f622e0",
@@ -811,10 +1028,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g1v1_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d1g1v1_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g1v1Filler.json"
         },
         "blocks" : [
@@ -825,19 +1042,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x021c38",
-                    "hash" : "0xde0d7f268e0adabcff5ac7defd9fb3ccff7a9b488a29a41e2f447428d23dde9a",
-                    "mixHash" : "0x7348466d4376faee94954b49535faaf4ca4a21a3296114d637b79d3d81a89a5e",
-                    "nonce" : "0x5dad6465b199c00e",
+                    "gasUsed" : "0x0222e0",
+                    "hash" : "0x1371a361290876fa4fc235abdc3c1fa19ee01381b3eb50ea2b9fd4d7312f62c6",
+                    "mixHash" : "0xd4fe94a65065e0bdd33f0dd7177571f10cd95d96b6921d8b45c20850c5e41805",
+                    "nonce" : "0xeb33393860577740",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x24d2d186ab09293dbc34b96a81c4c5b17ca8ffcaf089fac761837eb4295292ce",
-                    "stateRoot" : "0xce4e66c72c075a0f93843f269406dbe35dcdcc3f047d9739dc77ad2e3500bbfe",
+                    "receiptTrie" : "0x4127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705",
+                    "stateRoot" : "0x4a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6a41539b2c1309117fd1a773ee26e486e94fa9223118a393cdb359780aab8ea5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ce4e66c72c075a0f93843f269406dbe35dcdcc3f047d9739dc77ad2e3500bbfea06a41539b2c1309117fd1a773ee26e486e94fa9223118a393cdb359780aab8ea5a024d2d186ab09293dbc34b96a81c4c5b17ca8ffcaf089fac761837eb4295292ceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a07348466d4376faee94954b49535faaf4ca4a21a3296114d637b79d3d81a89a5e885dad6465b199c00ef882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca0ccbff1085912056dce32aa4f32dd72efed1f05fc8fd0315e2eec212dbdb7aef0a032bd71f772e670eec9325ea1da4c6ccd6f5723ec81877461d81650cfc87cb55ac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca06a41539b2c1309117fd1a773ee26e486e94fa9223118a393cdb359780aab8ea5a04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a0d4fe94a65065e0bdd33f0dd7177571f10cd95d96b6921d8b45c20850c5e4180588eb33393860577740f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca0ccbff1085912056dce32aa4f32dd72efed1f05fc8fd0315e2eec212dbdb7aef0a032bd71f772e670eec9325ea1da4c6ccd6f5723ec81877461d81650cfc87cb55ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -874,18 +1091,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xde0d7f268e0adabcff5ac7defd9fb3ccff7a9b488a29a41e2f447428d23dde9a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x1371a361290876fa4fc235abdc3c1fa19ee01381b3eb50ea2b9fd4d7312f62c6",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f61c38",
+                "balance" : "0x4563918244f622e0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -920,14 +1130,14 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2f3be",
+                "balance" : "0xe8d4a2ed20",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
-                "balance" : "0x0a",
+                "balance" : "0x00",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g2v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g2v0.json
index 8396bc3c8..58d963a4f 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g2v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d1g2v0_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d1g2v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g2v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x026893",
-                    "hash" : "0x4822476f2a593eb87bbeec4f0e45849521f9cee1727e7c3e970e4d3407ec0926",
-                    "mixHash" : "0x918a24950d2c641271242e81806e7e21dbf9851a84709281d209476886b578b0",
-                    "nonce" : "0xd5f774f61f3f89f3",
+                    "gasUsed" : "0x021f88",
+                    "hash" : "0x85a5097c09957803db130374bbeabc0c94d5598772ef28d1ded2e2571133a3e2",
+                    "mixHash" : "0xba3849cdd3642d5c2b70ea219a1e41af1c2265d9ff078f23a46e2a178a0c669f",
+                    "nonce" : "0x02b30288d99bb436",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xfaa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bc",
-                    "stateRoot" : "0x1c7205499c9374238b01f9165469bffa499f1e737f29ea24b7db2a6602e0618b",
+                    "receiptTrie" : "0x73ffc464b3c71b246e079dec87fc3e85ed52fb232d3aa6abfccceadb47864911",
+                    "stateRoot" : "0xac7d57dd85f91e28659d95ecf95d41284b7d97918e0cf41124399c2d54e9fa77",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x49c5a6a09339f07b964fdfd94b4395d9a053c94c5468c7bbfcc2a6b9dc40234e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c7205499c9374238b01f9165469bffa499f1e737f29ea24b7db2a6602e0618ba049c5a6a09339f07b964fdfd94b4395d9a053c94c5468c7bbfcc2a6b9dc40234ea0faa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bcb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830268938203e880a0918a24950d2c641271242e81806e7e21dbf9851a84709281d209476886b578b088d5f774f61f3f89f3f882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca07b03b81099b7f38c4cf743f7d27d48a14ff1fd7ce7586cc74e57400d0331761ea020e07705e8042e6fac9854e051553ea6d71c07591556aa2115f8eb93406f4a24c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac7d57dd85f91e28659d95ecf95d41284b7d97918e0cf41124399c2d54e9fa77a049c5a6a09339f07b964fdfd94b4395d9a053c94c5468c7bbfcc2a6b9dc40234ea073ffc464b3c71b246e079dec87fc3e85ed52fb232d3aa6abfccceadb47864911b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021f888203e880a0ba3849cdd3642d5c2b70ea219a1e41af1c2265d9ff078f23a46e2a178a0c669f8802b30288d99bb436f882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca07b03b81099b7f38c4cf743f7d27d48a14ff1fd7ce7586cc74e57400d0331761ea020e07705e8042e6fac9854e051553ea6d71c07591556aa2115f8eb93406f4a24c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4822476f2a593eb87bbeec4f0e45849521f9cee1727e7c3e970e4d3407ec0926",
-        "network" : "EIP150",
+        "lastblockhash" : "0x85a5097c09957803db130374bbeabc0c94d5598772ef28d1ded2e2571133a3e2",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f66893",
+                "balance" : "0x4563918244f61f88",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -84,6 +91,8 @@
                 "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c"
                 }
             },
             "0xa200000000000000000000000000000000000000" : {
@@ -101,7 +110,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2a76d",
+                "balance" : "0xe8d4a2f078",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -202,10 +211,222 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g2v0_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d1g2v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g2v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x021f88",
+                    "hash" : "0xb44c913d72f1948d503b49a9db80d7329ea22cb0c17129853234bbd7547c3a22",
+                    "mixHash" : "0x8e13d604f9e9a2d555a88652162c1f5b1920cb781a9ed05a2f91f9744cbb181c",
+                    "nonce" : "0x89067afe83ee9b34",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0x73ffc464b3c71b246e079dec87fc3e85ed52fb232d3aa6abfccceadb47864911",
+                    "stateRoot" : "0xac7d57dd85f91e28659d95ecf95d41284b7d97918e0cf41124399c2d54e9fa77",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x49c5a6a09339f07b964fdfd94b4395d9a053c94c5468c7bbfcc2a6b9dc40234e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac7d57dd85f91e28659d95ecf95d41284b7d97918e0cf41124399c2d54e9fa77a049c5a6a09339f07b964fdfd94b4395d9a053c94c5468c7bbfcc2a6b9dc40234ea073ffc464b3c71b246e079dec87fc3e85ed52fb232d3aa6abfccceadb47864911b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021f888203e880a08e13d604f9e9a2d555a88652162c1f5b1920cb781a9ed05a2f91f9744cbb181c8889067afe83ee9b34f882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca07b03b81099b7f38c4cf743f7d27d48a14ff1fd7ce7586cc74e57400d0331761ea020e07705e8042e6fac9854e051553ea6d71c07591556aa2115f8eb93406f4a24c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
+                        "gasLimit" : "0x027100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7b03b81099b7f38c4cf743f7d27d48a14ff1fd7ce7586cc74e57400d0331761e",
+                        "s" : "0x20e07705e8042e6fac9854e051553ea6d71c07591556aa2115f8eb93406f4a24",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb44c913d72f1948d503b49a9db80d7329ea22cb0c17129853234bbd7547c3a22",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f61f88",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c"
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2f078",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d1g2v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g2v0Filler.json"
         },
         "blocks" : [
@@ -217,9 +438,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x026893",
-                    "hash" : "0x05da5f9f90b8709eb6b24f9c934dae055535be3093ab2e67d9bdac1766d4999f",
-                    "mixHash" : "0xd37f5bb04ecae2cd5bc257cf7e7c91a54eebb4c036470271f0aa4ec18aa9d4df",
-                    "nonce" : "0x8256f3a00f58d0ad",
+                    "hash" : "0x00424bd135f1c301f3df4611c994e95bfdac8ea5054d1e95a7530b7ebea26efa",
+                    "mixHash" : "0x80200b240aebf4b6f5cef3d4f612ec182e14fcf212c0cb1fcf4166fe363a7072",
+                    "nonce" : "0xc7f0c54e928ce43e",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xfaa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bc",
@@ -228,7 +449,7 @@
                     "transactionsTrie" : "0x49c5a6a09339f07b964fdfd94b4395d9a053c94c5468c7bbfcc2a6b9dc40234e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c7205499c9374238b01f9165469bffa499f1e737f29ea24b7db2a6602e0618ba049c5a6a09339f07b964fdfd94b4395d9a053c94c5468c7bbfcc2a6b9dc40234ea0faa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bcb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830268938203e880a0d37f5bb04ecae2cd5bc257cf7e7c91a54eebb4c036470271f0aa4ec18aa9d4df888256f3a00f58d0adf882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca07b03b81099b7f38c4cf743f7d27d48a14ff1fd7ce7586cc74e57400d0331761ea020e07705e8042e6fac9854e051553ea6d71c07591556aa2115f8eb93406f4a24c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c7205499c9374238b01f9165469bffa499f1e737f29ea24b7db2a6602e0618ba049c5a6a09339f07b964fdfd94b4395d9a053c94c5468c7bbfcc2a6b9dc40234ea0faa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bcb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830268938203e880a080200b240aebf4b6f5cef3d4f612ec182e14fcf212c0cb1fcf4166fe363a707288c7f0c54e928ce43ef882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca07b03b81099b7f38c4cf743f7d27d48a14ff1fd7ce7586cc74e57400d0331761ea020e07705e8042e6fac9854e051553ea6d71c07591556aa2115f8eb93406f4a24c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -265,8 +486,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x05da5f9f90b8709eb6b24f9c934dae055535be3093ab2e67d9bdac1766d4999f",
-        "network" : "EIP158",
+        "lastblockhash" : "0x00424bd135f1c301f3df4611c994e95bfdac8ea5054d1e95a7530b7ebea26efa",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f66893",
@@ -405,10 +626,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g2v0_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d1g2v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g2v0Filler.json"
         },
         "blocks" : [
@@ -419,19 +640,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x027100",
-                    "hash" : "0x5036b72488c01c552be303eca4c2aaf60bf0f0be22315781a4892dc6a49820c4",
-                    "mixHash" : "0xb93c1261acc56ff7dbd6967985f7d11aab2090afdfb6e5a411979294a78d2a2e",
-                    "nonce" : "0x16d89f06a3011686",
+                    "gasUsed" : "0x026893",
+                    "hash" : "0xd8b31fd61a223b4043d9d1f0c38d68429a432cd9a476ba8d4212db56fe096e6a",
+                    "mixHash" : "0x3e4be99de97fcd5b37a231a11357ca68f37f6e7e4247cfac8c5e0c5b6283a1a5",
+                    "nonce" : "0xa8387c10f1bb0c22",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
-                    "stateRoot" : "0x73f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26e",
+                    "receiptTrie" : "0xfaa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bc",
+                    "stateRoot" : "0x1c7205499c9374238b01f9165469bffa499f1e737f29ea24b7db2a6602e0618b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x49c5a6a09339f07b964fdfd94b4395d9a053c94c5468c7bbfcc2a6b9dc40234e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea049c5a6a09339f07b964fdfd94b4395d9a053c94c5468c7bbfcc2a6b9dc40234ea06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0b93c1261acc56ff7dbd6967985f7d11aab2090afdfb6e5a411979294a78d2a2e8816d89f06a3011686f882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca07b03b81099b7f38c4cf743f7d27d48a14ff1fd7ce7586cc74e57400d0331761ea020e07705e8042e6fac9854e051553ea6d71c07591556aa2115f8eb93406f4a24c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c7205499c9374238b01f9165469bffa499f1e737f29ea24b7db2a6602e0618ba049c5a6a09339f07b964fdfd94b4395d9a053c94c5468c7bbfcc2a6b9dc40234ea0faa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bcb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830268938203e880a03e4be99de97fcd5b37a231a11357ca68f37f6e7e4247cfac8c5e0c5b6283a1a588a8387c10f1bb0c22f882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca07b03b81099b7f38c4cf743f7d27d48a14ff1fd7ce7586cc74e57400d0331761ea020e07705e8042e6fac9854e051553ea6d71c07591556aa2115f8eb93406f4a24c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -468,11 +689,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5036b72488c01c552be303eca4c2aaf60bf0f0be22315781a4892dc6a49820c4",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd8b31fd61a223b4043d9d1f0c38d68429a432cd9a476ba8d4212db56fe096e6a",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f67100",
+                "balance" : "0x4563918244f66893",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,7 +728,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a29f00",
+                "balance" : "0xe8d4a2a76d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -608,10 +829,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g2v0_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d1g2v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g2v0Filler.json"
         },
         "blocks" : [
@@ -623,9 +844,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0x50c609b058b753c80beaeb1a9755481870d8a3d2b98008ab7fa2402ec5be0442",
-                    "mixHash" : "0x487e1a10851aa14e72659c2049d1aff1c05ba5475525f01e2363cf1852eb1f78",
-                    "nonce" : "0x76f0356160e02f06",
+                    "hash" : "0xd74642728a1716abeae4c5b3e63168cb73bfcaa391eeee131060fb4841344ae6",
+                    "mixHash" : "0x982babafb4540bcda45495c9c044c7ad6f97f8a3724cf55498fde47219171354",
+                    "nonce" : "0xc54ac35309f9d5b3",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
@@ -634,7 +855,7 @@
                     "transactionsTrie" : "0x49c5a6a09339f07b964fdfd94b4395d9a053c94c5468c7bbfcc2a6b9dc40234e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea049c5a6a09339f07b964fdfd94b4395d9a053c94c5468c7bbfcc2a6b9dc40234ea06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0487e1a10851aa14e72659c2049d1aff1c05ba5475525f01e2363cf1852eb1f788876f0356160e02f06f882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca07b03b81099b7f38c4cf743f7d27d48a14ff1fd7ce7586cc74e57400d0331761ea020e07705e8042e6fac9854e051553ea6d71c07591556aa2115f8eb93406f4a24c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea049c5a6a09339f07b964fdfd94b4395d9a053c94c5468c7bbfcc2a6b9dc40234ea06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0982babafb4540bcda45495c9c044c7ad6f97f8a3724cf55498fde4721917135488c54ac35309f9d5b3f882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca07b03b81099b7f38c4cf743f7d27d48a14ff1fd7ce7586cc74e57400d0331761ea020e07705e8042e6fac9854e051553ea6d71c07591556aa2115f8eb93406f4a24c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -671,8 +892,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x50c609b058b753c80beaeb1a9755481870d8a3d2b98008ab7fa2402ec5be0442",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd74642728a1716abeae4c5b3e63168cb73bfcaa391eeee131060fb4841344ae6",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f67100",
@@ -811,10 +1032,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g2v0_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d1g2v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g2v0Filler.json"
         },
         "blocks" : [
@@ -825,19 +1046,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x021f88",
-                    "hash" : "0x13ef40def25e66de5660567922622978a2f9d51f30b68535358a93f43ba96550",
-                    "mixHash" : "0xdde2775f8b7c20e37d9f2f2381612f50fe3a7047c67336482d4890d423afce9d",
-                    "nonce" : "0x3b68881ba2fe69a6",
+                    "gasUsed" : "0x027100",
+                    "hash" : "0x9805d4ca105e32969e8600d06f1f7a8ec3f7578b250b731311f9b6a487136a46",
+                    "mixHash" : "0xbc427b3412322fc8be27e4c9c45ec426156a6ecc2c0799151cc53d90a3295047",
+                    "nonce" : "0x4c5d98fbfcf2f2e9",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x73ffc464b3c71b246e079dec87fc3e85ed52fb232d3aa6abfccceadb47864911",
-                    "stateRoot" : "0xac7d57dd85f91e28659d95ecf95d41284b7d97918e0cf41124399c2d54e9fa77",
+                    "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
+                    "stateRoot" : "0x73f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x49c5a6a09339f07b964fdfd94b4395d9a053c94c5468c7bbfcc2a6b9dc40234e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac7d57dd85f91e28659d95ecf95d41284b7d97918e0cf41124399c2d54e9fa77a049c5a6a09339f07b964fdfd94b4395d9a053c94c5468c7bbfcc2a6b9dc40234ea073ffc464b3c71b246e079dec87fc3e85ed52fb232d3aa6abfccceadb47864911b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021f888203e880a0dde2775f8b7c20e37d9f2f2381612f50fe3a7047c67336482d4890d423afce9d883b68881ba2fe69a6f882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca07b03b81099b7f38c4cf743f7d27d48a14ff1fd7ce7586cc74e57400d0331761ea020e07705e8042e6fac9854e051553ea6d71c07591556aa2115f8eb93406f4a24c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea049c5a6a09339f07b964fdfd94b4395d9a053c94c5468c7bbfcc2a6b9dc40234ea06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0bc427b3412322fc8be27e4c9c45ec426156a6ecc2c0799151cc53d90a3295047884c5d98fbfcf2f2e9f882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca07b03b81099b7f38c4cf743f7d27d48a14ff1fd7ce7586cc74e57400d0331761ea020e07705e8042e6fac9854e051553ea6d71c07591556aa2115f8eb93406f4a24c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -874,18 +1095,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x13ef40def25e66de5660567922622978a2f9d51f30b68535358a93f43ba96550",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9805d4ca105e32969e8600d06f1f7a8ec3f7578b250b731311f9b6a487136a46",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f61f88",
+                "balance" : "0x4563918244f67100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -903,8 +1117,6 @@
                 "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x04" : "0x0c",
-                    "0x05" : "0x0c"
                 }
             },
             "0xa200000000000000000000000000000000000000" : {
@@ -922,7 +1134,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2f078",
+                "balance" : "0xe8d4a29f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g2v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g2v1.json
index 711163d37..ba5a40150 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g2v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g2v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d1g2v1_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d1g2v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g2v1Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x026920",
-                    "hash" : "0xe4a80b9976ae72050980f62332c22b15e831b3df77ac76d7bf4fdf9d98603e68",
-                    "mixHash" : "0x6a3cad0ce1031d6ad0e46abd28f0331ffc37c66e38458100bd95cf78311731a4",
-                    "nonce" : "0xf585d58beba853ac",
+                    "gasUsed" : "0x0239b4",
+                    "hash" : "0x612eac10658d7657a558ee22da4e7a4dbf04eae62eb93e668530968be736b085",
+                    "mixHash" : "0xc60fac822007b59f477a614c13dbe032872b18908a70cdba0d6149b6c7993d08",
+                    "nonce" : "0x5443bfcd9025fd4b",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0c",
-                    "stateRoot" : "0xc1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750af",
+                    "receiptTrie" : "0x2c8982f9884df66f5bff5b9487b808a3115de89765f000b65f769677eaa677cf",
+                    "stateRoot" : "0xe3bb0aceaf57d8b60753a6bfa6ad28bfd71a89bbd6945d4f3be73851e091d298",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0f594b3ba497f6cdc693d2575a1a0fae9941c892307319d2626ed96f39b69ca5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750afa00f594b3ba497f6cdc693d2575a1a0fae9941c892307319d2626ed96f39b69ca5a0ab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830269208203e880a06a3cad0ce1031d6ad0e46abd28f0331ffc37c66e38458100bd95cf78311731a488f585d58beba853acf882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca0602d629b9775ae2d8a02dbe0c1c4f505b1cb6bd24dbdc9a43d7300a7e93b8cb7a062f34a0a7cef9b4eac9f0a6dc1771f1c4b1e6c31fd60d697c8ed3be2aaa2b40ac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3bb0aceaf57d8b60753a6bfa6ad28bfd71a89bbd6945d4f3be73851e091d298a00f594b3ba497f6cdc693d2575a1a0fae9941c892307319d2626ed96f39b69ca5a02c8982f9884df66f5bff5b9487b808a3115de89765f000b65f769677eaa677cfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239b48203e880a0c60fac822007b59f477a614c13dbe032872b18908a70cdba0d6149b6c7993d08885443bfcd9025fd4bf882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca0602d629b9775ae2d8a02dbe0c1c4f505b1cb6bd24dbdc9a43d7300a7e93b8cb7a062f34a0a7cef9b4eac9f0a6dc1771f1c4b1e6c31fd60d697c8ed3be2aaa2b40ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe4a80b9976ae72050980f62332c22b15e831b3df77ac76d7bf4fdf9d98603e68",
-        "network" : "EIP150",
+        "lastblockhash" : "0x612eac10658d7657a558ee22da4e7a4dbf04eae62eb93e668530968be736b085",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f66920",
+                "balance" : "0x4563918244f639b4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -80,10 +87,12 @@
                 }
             },
             "0xa100000000000000000000000000000000000000" : {
-                "balance" : "0x00",
+                "balance" : "0x0a",
                 "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c"
                 }
             },
             "0xa200000000000000000000000000000000000000" : {
@@ -101,14 +110,226 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2a6d6",
+                "balance" : "0xe8d4a2d642",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d1g2v1_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g2v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0239b4",
+                    "hash" : "0xfdd2313207b84ebb4646d0f35ab6134b83c34ff89ad884f2308c8f40a0215ea6",
+                    "mixHash" : "0xcd305f3fca147124b488891dcb0b4fb330936a2b7a974f3afa7abff47f70384a",
+                    "nonce" : "0xd3c29ed6fdcb0c14",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0x2c8982f9884df66f5bff5b9487b808a3115de89765f000b65f769677eaa677cf",
+                    "stateRoot" : "0xe3bb0aceaf57d8b60753a6bfa6ad28bfd71a89bbd6945d4f3be73851e091d298",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0f594b3ba497f6cdc693d2575a1a0fae9941c892307319d2626ed96f39b69ca5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3bb0aceaf57d8b60753a6bfa6ad28bfd71a89bbd6945d4f3be73851e091d298a00f594b3ba497f6cdc693d2575a1a0fae9941c892307319d2626ed96f39b69ca5a02c8982f9884df66f5bff5b9487b808a3115de89765f000b65f769677eaa677cfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239b48203e880a0cd305f3fca147124b488891dcb0b4fb330936a2b7a974f3afa7abff47f70384a88d3c29ed6fdcb0c14f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca0602d629b9775ae2d8a02dbe0c1c4f505b1cb6bd24dbdc9a43d7300a7e93b8cb7a062f34a0a7cef9b4eac9f0a6dc1771f1c4b1e6c31fd60d697c8ed3be2aaa2b40ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
+                        "gasLimit" : "0x027100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x602d629b9775ae2d8a02dbe0c1c4f505b1cb6bd24dbdc9a43d7300a7e93b8cb7",
+                        "s" : "0x62f34a0a7cef9b4eac9f0a6dc1771f1c4b1e6c31fd60d697c8ed3be2aaa2b40a",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfdd2313207b84ebb4646d0f35ab6134b83c34ff89ad884f2308c8f40a0215ea6",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f639b4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
                 "balance" : "0x0a",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c"
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2d642",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
@@ -202,10 +423,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g2v1_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d1g2v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g2v1Filler.json"
         },
         "blocks" : [
@@ -217,9 +438,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x026920",
-                    "hash" : "0xfb58e4ca86293ef0c69ad18d726d760f348fd24809dbb3c586cd6af91778a056",
-                    "mixHash" : "0x95ba4b51eac70d89466582d296fb0f04d3485ccda1dfa4515f06777aa32e88fb",
-                    "nonce" : "0x8ca12164ff7ed436",
+                    "hash" : "0x8341aec3dd772fdc79b1aec1ef39d87430c6be232e3cd747a9379887e480f597",
+                    "mixHash" : "0x0f7a582125aeaaa3521df9b707527e5883f11141e3fe51fdd589b3802f2fd7b7",
+                    "nonce" : "0xcbba5a341acfa7cb",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0c",
@@ -228,7 +449,7 @@
                     "transactionsTrie" : "0x0f594b3ba497f6cdc693d2575a1a0fae9941c892307319d2626ed96f39b69ca5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750afa00f594b3ba497f6cdc693d2575a1a0fae9941c892307319d2626ed96f39b69ca5a0ab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830269208203e880a095ba4b51eac70d89466582d296fb0f04d3485ccda1dfa4515f06777aa32e88fb888ca12164ff7ed436f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca0602d629b9775ae2d8a02dbe0c1c4f505b1cb6bd24dbdc9a43d7300a7e93b8cb7a062f34a0a7cef9b4eac9f0a6dc1771f1c4b1e6c31fd60d697c8ed3be2aaa2b40ac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750afa00f594b3ba497f6cdc693d2575a1a0fae9941c892307319d2626ed96f39b69ca5a0ab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830269208203e880a00f7a582125aeaaa3521df9b707527e5883f11141e3fe51fdd589b3802f2fd7b788cbba5a341acfa7cbf882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca0602d629b9775ae2d8a02dbe0c1c4f505b1cb6bd24dbdc9a43d7300a7e93b8cb7a062f34a0a7cef9b4eac9f0a6dc1771f1c4b1e6c31fd60d697c8ed3be2aaa2b40ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -265,8 +486,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfb58e4ca86293ef0c69ad18d726d760f348fd24809dbb3c586cd6af91778a056",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8341aec3dd772fdc79b1aec1ef39d87430c6be232e3cd747a9379887e480f597",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f66920",
@@ -405,10 +626,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g2v1_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d1g2v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g2v1Filler.json"
         },
         "blocks" : [
@@ -419,19 +640,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x027100",
-                    "hash" : "0x30e82ee95bfd58575c813b41f91ad292e587d7a5ded9906c8578159943000830",
-                    "mixHash" : "0xc3efc25994b4bf572c898e84e49093f984f1b489e9ac7e48084df7e30e6f1671",
-                    "nonce" : "0xf134bd6d6728459f",
+                    "gasUsed" : "0x026920",
+                    "hash" : "0x9d14960eccd9ac1e2d2b68a210a2c38dd8f383a1bbc40fd44cb9999115eb4085",
+                    "mixHash" : "0xad02f09688a5256a0ffc146f0d2895eca36ee022705c116ab6a670818599e9c7",
+                    "nonce" : "0xd8746a46447d0260",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
-                    "stateRoot" : "0x73f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26e",
+                    "receiptTrie" : "0xab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0c",
+                    "stateRoot" : "0xc1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750af",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0f594b3ba497f6cdc693d2575a1a0fae9941c892307319d2626ed96f39b69ca5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea00f594b3ba497f6cdc693d2575a1a0fae9941c892307319d2626ed96f39b69ca5a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0c3efc25994b4bf572c898e84e49093f984f1b489e9ac7e48084df7e30e6f167188f134bd6d6728459ff882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca0602d629b9775ae2d8a02dbe0c1c4f505b1cb6bd24dbdc9a43d7300a7e93b8cb7a062f34a0a7cef9b4eac9f0a6dc1771f1c4b1e6c31fd60d697c8ed3be2aaa2b40ac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750afa00f594b3ba497f6cdc693d2575a1a0fae9941c892307319d2626ed96f39b69ca5a0ab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830269208203e880a0ad02f09688a5256a0ffc146f0d2895eca36ee022705c116ab6a670818599e9c788d8746a46447d0260f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca0602d629b9775ae2d8a02dbe0c1c4f505b1cb6bd24dbdc9a43d7300a7e93b8cb7a062f34a0a7cef9b4eac9f0a6dc1771f1c4b1e6c31fd60d697c8ed3be2aaa2b40ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -468,11 +689,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x30e82ee95bfd58575c813b41f91ad292e587d7a5ded9906c8578159943000830",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9d14960eccd9ac1e2d2b68a210a2c38dd8f383a1bbc40fd44cb9999115eb4085",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f67100",
+                "balance" : "0x4563918244f66920",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,14 +728,14 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a29f00",
+                "balance" : "0xe8d4a2a6d6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
-                "balance" : "0x00",
+                "balance" : "0x0a",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
@@ -608,10 +829,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g2v1_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d1g2v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g2v1Filler.json"
         },
         "blocks" : [
@@ -623,9 +844,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0x9e2007839e527dc9083e7ce3128dcd319099e4b92885d5c3cbe3a51d598dee91",
-                    "mixHash" : "0xad4e12806c3468be6b4a1713561959cf23a47c23379ad76c5b246b6cbcee028a",
-                    "nonce" : "0x893c476c12120ee3",
+                    "hash" : "0xc62ea6ee5dd0f8054682e3e8ed8e9be5666317d1bb0fe3243b81361db4aaadca",
+                    "mixHash" : "0x1081e831053885b68cf8f5ac272840d75bdc078ef59fdb14808663722621d3f0",
+                    "nonce" : "0x41e1f966513bc4f7",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
@@ -634,7 +855,7 @@
                     "transactionsTrie" : "0x0f594b3ba497f6cdc693d2575a1a0fae9941c892307319d2626ed96f39b69ca5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea00f594b3ba497f6cdc693d2575a1a0fae9941c892307319d2626ed96f39b69ca5a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0ad4e12806c3468be6b4a1713561959cf23a47c23379ad76c5b246b6cbcee028a88893c476c12120ee3f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca0602d629b9775ae2d8a02dbe0c1c4f505b1cb6bd24dbdc9a43d7300a7e93b8cb7a062f34a0a7cef9b4eac9f0a6dc1771f1c4b1e6c31fd60d697c8ed3be2aaa2b40ac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea00f594b3ba497f6cdc693d2575a1a0fae9941c892307319d2626ed96f39b69ca5a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a01081e831053885b68cf8f5ac272840d75bdc078ef59fdb14808663722621d3f08841e1f966513bc4f7f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca0602d629b9775ae2d8a02dbe0c1c4f505b1cb6bd24dbdc9a43d7300a7e93b8cb7a062f34a0a7cef9b4eac9f0a6dc1771f1c4b1e6c31fd60d697c8ed3be2aaa2b40ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -671,8 +892,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9e2007839e527dc9083e7ce3128dcd319099e4b92885d5c3cbe3a51d598dee91",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc62ea6ee5dd0f8054682e3e8ed8e9be5666317d1bb0fe3243b81361db4aaadca",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f67100",
@@ -811,10 +1032,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g2v1_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d1g2v1_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g2v1Filler.json"
         },
         "blocks" : [
@@ -825,19 +1046,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0239b4",
-                    "hash" : "0x6308c2d84f158d3dc7a68e9cd7095799534e30503afe0426ed749be61edfc435",
-                    "mixHash" : "0xbb17c90f167ad955d1f8a553bd237595d032e9ebd240c38792331342cf296fb2",
-                    "nonce" : "0x8ea561f019a4c3a0",
+                    "gasUsed" : "0x027100",
+                    "hash" : "0xd5100622d2587705edff580656bc83170c82994509bf8d503a8afcf13598c389",
+                    "mixHash" : "0x58303dddd1d84f6c6bd9cbd653efecfefb9e74df762334b4217b102960e565d0",
+                    "nonce" : "0x74aaabde081d4cf1",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x2c8982f9884df66f5bff5b9487b808a3115de89765f000b65f769677eaa677cf",
-                    "stateRoot" : "0xe3bb0aceaf57d8b60753a6bfa6ad28bfd71a89bbd6945d4f3be73851e091d298",
+                    "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
+                    "stateRoot" : "0x73f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0f594b3ba497f6cdc693d2575a1a0fae9941c892307319d2626ed96f39b69ca5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3bb0aceaf57d8b60753a6bfa6ad28bfd71a89bbd6945d4f3be73851e091d298a00f594b3ba497f6cdc693d2575a1a0fae9941c892307319d2626ed96f39b69ca5a02c8982f9884df66f5bff5b9487b808a3115de89765f000b65f769677eaa677cfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239b48203e880a0bb17c90f167ad955d1f8a553bd237595d032e9ebd240c38792331342cf296fb2888ea561f019a4c3a0f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca0602d629b9775ae2d8a02dbe0c1c4f505b1cb6bd24dbdc9a43d7300a7e93b8cb7a062f34a0a7cef9b4eac9f0a6dc1771f1c4b1e6c31fd60d697c8ed3be2aaa2b40ac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea00f594b3ba497f6cdc693d2575a1a0fae9941c892307319d2626ed96f39b69ca5a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a058303dddd1d84f6c6bd9cbd653efecfefb9e74df762334b4217b102960e565d08874aaabde081d4cf1f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca0602d629b9775ae2d8a02dbe0c1c4f505b1cb6bd24dbdc9a43d7300a7e93b8cb7a062f34a0a7cef9b4eac9f0a6dc1771f1c4b1e6c31fd60d697c8ed3be2aaa2b40ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -874,18 +1095,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6308c2d84f158d3dc7a68e9cd7095799534e30503afe0426ed749be61edfc435",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd5100622d2587705edff580656bc83170c82994509bf8d503a8afcf13598c389",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f639b4",
+                "balance" : "0x4563918244f67100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -899,12 +1113,10 @@
                 }
             },
             "0xa100000000000000000000000000000000000000" : {
-                "balance" : "0x0a",
+                "balance" : "0x00",
                 "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x04" : "0x0c",
-                    "0x05" : "0x0c"
                 }
             },
             "0xa200000000000000000000000000000000000000" : {
@@ -922,7 +1134,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2d642",
+                "balance" : "0xe8d4a29f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g3v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g3v0.json
index d1f3e5dac..8b2e41462 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g3v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d1g3v0_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d1g3v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g3v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc19a",
-                    "hash" : "0xf585da069b5397b412549f0c040ef9f3c103c71a5ac8d5046c494fab3e867a61",
-                    "mixHash" : "0x3c75f5153de64a6e85a99f0d7fc2cd3ed32d64f208baacd2f235f76dc4c0dabe",
-                    "nonce" : "0x1bba1776873096f7",
+                    "hash" : "0x1eae759659e5ba3d69dc8810140b4f93198a8834e5992a2d3911dc3091515dca",
+                    "mixHash" : "0x2f2ef7f7778f5bfe7051e7195d4c8a5e602a5b848398bbd190897778437dc744",
+                    "nonce" : "0x46beb8c321903431",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x49a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2",
-                    "stateRoot" : "0xb4256760b0753a45c56007cb8a35d18a80d9f299b53a760175cc01ceb6ca5f21",
+                    "receiptTrie" : "0xa5d0e8d32ee861e79b211e90c606d96e95bc73bea255ede5fb9fd90bb7cedb39",
+                    "stateRoot" : "0x0725c487930e2041eba0397686c9146c5f6febc65a64f425b8b748883d8428fc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5a2bb7c3da7b690106c8525c0fbb8488526a0c1a14b9aa5fba7057814c26031b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4256760b0753a45c56007cb8a35d18a80d9f299b53a760175cc01ceb6ca5f21a05a2bb7c3da7b690106c8525c0fbb8488526a0c1a14b9aa5fba7057814c26031ba049a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a03c75f5153de64a6e85a99f0d7fc2cd3ed32d64f208baacd2f235f76dc4c0dabe881bba1776873096f7f881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca02495ab08c225a526b0d5842f144ad1122c7cdc3a1652c77cd3b085776fa4c552a0058e7e6f5b77285c12d6b587711ef9f67e7f85162f4ae9b27a29ebd97205fad2c0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00725c487930e2041eba0397686c9146c5f6febc65a64f425b8b748883d8428fca05a2bb7c3da7b690106c8525c0fbb8488526a0c1a14b9aa5fba7057814c26031ba0a5d0e8d32ee861e79b211e90c606d96e95bc73bea255ede5fb9fd90bb7cedb39b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a02f2ef7f7778f5bfe7051e7195d4c8a5e602a5b848398bbd190897778437dc7448846beb8c321903431f881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca02495ab08c225a526b0d5842f144ad1122c7cdc3a1652c77cd3b085776fa4c552a0058e7e6f5b77285c12d6b587711ef9f67e7f85162f4ae9b27a29ebd97205fad2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf585da069b5397b412549f0c040ef9f3c103c71a5ac8d5046c494fab3e867a61",
-        "network" : "EIP150",
+        "lastblockhash" : "0x1eae759659e5ba3d69dc8810140b4f93198a8834e5992a2d3911dc3091515dca",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c19a",
                 "code" : "",
@@ -202,10 +209,220 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g3v0_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d1g3v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g3v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xc19a",
+                    "hash" : "0x583eb43bc4299dbe64abcd25e2ed7330c7d540e0e880945b54b105dae38e70a7",
+                    "mixHash" : "0x841e83eee35abf14074b156f698b15cca64d2242d11313921386d2bf45b635f0",
+                    "nonce" : "0xc4a5cc44afa020c2",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0xa5d0e8d32ee861e79b211e90c606d96e95bc73bea255ede5fb9fd90bb7cedb39",
+                    "stateRoot" : "0x0725c487930e2041eba0397686c9146c5f6febc65a64f425b8b748883d8428fc",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5a2bb7c3da7b690106c8525c0fbb8488526a0c1a14b9aa5fba7057814c26031b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00725c487930e2041eba0397686c9146c5f6febc65a64f425b8b748883d8428fca05a2bb7c3da7b690106c8525c0fbb8488526a0c1a14b9aa5fba7057814c26031ba0a5d0e8d32ee861e79b211e90c606d96e95bc73bea255ede5fb9fd90bb7cedb39b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a0841e83eee35abf14074b156f698b15cca64d2242d11313921386d2bf45b635f088c4a5cc44afa020c2f881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca02495ab08c225a526b0d5842f144ad1122c7cdc3a1652c77cd3b085776fa4c552a0058e7e6f5b77285c12d6b587711ef9f67e7f85162f4ae9b27a29ebd97205fad2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
+                        "gasLimit" : "0xc350",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2495ab08c225a526b0d5842f144ad1122c7cdc3a1652c77cd3b085776fa4c552",
+                        "s" : "0x058e7e6f5b77285c12d6b587711ef9f67e7f85162f4ae9b27a29ebd97205fad2",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x583eb43bc4299dbe64abcd25e2ed7330c7d540e0e880945b54b105dae38e70a7",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c19a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a44e66",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d1g3v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g3v0Filler.json"
         },
         "blocks" : [
@@ -217,9 +434,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc19a",
-                    "hash" : "0xee4a585f17d66a45c039980845a920c6432c3c847c2c3800aa66ced521b9fa96",
-                    "mixHash" : "0x3154cab6fca20e830a2ed404dae2673776cf9ae328256be0a1158484d837da05",
-                    "nonce" : "0x31b73aa2c137776e",
+                    "hash" : "0x22fdb01564603bb5b5de82d064c1143964926898d7d99b5d50820db66697085d",
+                    "mixHash" : "0xd0a4270ae0e38190daf0cb485b4ca1b1e63198410302bf0c247a3c7bc11b5b74",
+                    "nonce" : "0x2bfbd32bae33a390",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x49a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2",
@@ -228,7 +445,7 @@
                     "transactionsTrie" : "0x5a2bb7c3da7b690106c8525c0fbb8488526a0c1a14b9aa5fba7057814c26031b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4256760b0753a45c56007cb8a35d18a80d9f299b53a760175cc01ceb6ca5f21a05a2bb7c3da7b690106c8525c0fbb8488526a0c1a14b9aa5fba7057814c26031ba049a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a03154cab6fca20e830a2ed404dae2673776cf9ae328256be0a1158484d837da058831b73aa2c137776ef881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca02495ab08c225a526b0d5842f144ad1122c7cdc3a1652c77cd3b085776fa4c552a0058e7e6f5b77285c12d6b587711ef9f67e7f85162f4ae9b27a29ebd97205fad2c0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4256760b0753a45c56007cb8a35d18a80d9f299b53a760175cc01ceb6ca5f21a05a2bb7c3da7b690106c8525c0fbb8488526a0c1a14b9aa5fba7057814c26031ba049a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a0d0a4270ae0e38190daf0cb485b4ca1b1e63198410302bf0c247a3c7bc11b5b74882bfbd32bae33a390f881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca02495ab08c225a526b0d5842f144ad1122c7cdc3a1652c77cd3b085776fa4c552a0058e7e6f5b77285c12d6b587711ef9f67e7f85162f4ae9b27a29ebd97205fad2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -265,8 +482,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xee4a585f17d66a45c039980845a920c6432c3c847c2c3800aa66ced521b9fa96",
-        "network" : "EIP158",
+        "lastblockhash" : "0x22fdb01564603bb5b5de82d064c1143964926898d7d99b5d50820db66697085d",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c19a",
@@ -405,10 +622,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g3v0_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d1g3v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g3v0Filler.json"
         },
         "blocks" : [
@@ -419,19 +636,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xc350",
-                    "hash" : "0x3f03456920115477ee4b766384d69f17c6ce2ef5a4d3f429b40e9f3c1ffd5cb0",
-                    "mixHash" : "0x8caac4766f8acf00d29e69c3d94c7180b0ac0d17aa821c9cb81912afbc5ce087",
-                    "nonce" : "0x7e33db1c814c0c8a",
+                    "gasUsed" : "0xc19a",
+                    "hash" : "0xa00bef906f76ac43a959200a90f57af415f227a2eca1ad99e0a3836ecddc91c1",
+                    "mixHash" : "0x6d16fb06fbdfc7047913b09265a729a98261229a0bc60fdce8611bb1bdb789ba",
+                    "nonce" : "0x88a38d7fb3f3c45e",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xb30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5a",
-                    "stateRoot" : "0xda427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5",
+                    "receiptTrie" : "0x49a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2",
+                    "stateRoot" : "0xb4256760b0753a45c56007cb8a35d18a80d9f299b53a760175cc01ceb6ca5f21",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5a2bb7c3da7b690106c8525c0fbb8488526a0c1a14b9aa5fba7057814c26031b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a05a2bb7c3da7b690106c8525c0fbb8488526a0c1a14b9aa5fba7057814c26031ba0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a08caac4766f8acf00d29e69c3d94c7180b0ac0d17aa821c9cb81912afbc5ce087887e33db1c814c0c8af881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca02495ab08c225a526b0d5842f144ad1122c7cdc3a1652c77cd3b085776fa4c552a0058e7e6f5b77285c12d6b587711ef9f67e7f85162f4ae9b27a29ebd97205fad2c0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4256760b0753a45c56007cb8a35d18a80d9f299b53a760175cc01ceb6ca5f21a05a2bb7c3da7b690106c8525c0fbb8488526a0c1a14b9aa5fba7057814c26031ba049a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a06d16fb06fbdfc7047913b09265a729a98261229a0bc60fdce8611bb1bdb789ba8888a38d7fb3f3c45ef881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca02495ab08c225a526b0d5842f144ad1122c7cdc3a1652c77cd3b085776fa4c552a0058e7e6f5b77285c12d6b587711ef9f67e7f85162f4ae9b27a29ebd97205fad2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -468,11 +685,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3f03456920115477ee4b766384d69f17c6ce2ef5a4d3f429b40e9f3c1ffd5cb0",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa00bef906f76ac43a959200a90f57af415f227a2eca1ad99e0a3836ecddc91c1",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4c350",
+                "balance" : "0x4563918244f4c19a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,7 +724,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a44cb0",
+                "balance" : "0xe8d4a44e66",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -608,10 +825,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g3v0_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d1g3v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g3v0Filler.json"
         },
         "blocks" : [
@@ -623,9 +840,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc350",
-                    "hash" : "0xea5e4819066ddf164299a5d67968157a841ad5dc005968c7e88bc6f759bb3668",
-                    "mixHash" : "0x02ae348cabf8fc0cbd31a8514700fd1c2d64e6a3da10f9bdf9412c8f91b14927",
-                    "nonce" : "0x8e889c3a87a78f54",
+                    "hash" : "0x563aeb751d9b467cfacc2c33dd0e0362b71f8b5fc6f98adae1716a6c9c9ec2cb",
+                    "mixHash" : "0xffe5a729e7c0091c5ed72a812c11b75d06246e4180fee0df0090780f7d1f4c44",
+                    "nonce" : "0xd6dd996af219bcc5",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xb30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5a",
@@ -634,7 +851,7 @@
                     "transactionsTrie" : "0x5a2bb7c3da7b690106c8525c0fbb8488526a0c1a14b9aa5fba7057814c26031b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a05a2bb7c3da7b690106c8525c0fbb8488526a0c1a14b9aa5fba7057814c26031ba0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a002ae348cabf8fc0cbd31a8514700fd1c2d64e6a3da10f9bdf9412c8f91b14927888e889c3a87a78f54f881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca02495ab08c225a526b0d5842f144ad1122c7cdc3a1652c77cd3b085776fa4c552a0058e7e6f5b77285c12d6b587711ef9f67e7f85162f4ae9b27a29ebd97205fad2c0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a05a2bb7c3da7b690106c8525c0fbb8488526a0c1a14b9aa5fba7057814c26031ba0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a0ffe5a729e7c0091c5ed72a812c11b75d06246e4180fee0df0090780f7d1f4c4488d6dd996af219bcc5f881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca02495ab08c225a526b0d5842f144ad1122c7cdc3a1652c77cd3b085776fa4c552a0058e7e6f5b77285c12d6b587711ef9f67e7f85162f4ae9b27a29ebd97205fad2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -671,8 +888,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xea5e4819066ddf164299a5d67968157a841ad5dc005968c7e88bc6f759bb3668",
-        "network" : "Homestead",
+        "lastblockhash" : "0x563aeb751d9b467cfacc2c33dd0e0362b71f8b5fc6f98adae1716a6c9c9ec2cb",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c350",
@@ -811,10 +1028,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g3v0_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d1g3v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g3v0Filler.json"
         },
         "blocks" : [
@@ -825,19 +1042,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xc19a",
-                    "hash" : "0xa9e7d938bc959d0d90e55a2fd3f249c3764470a06aee47ec796c9f29a7f492cd",
-                    "mixHash" : "0x12a9814ea6528019f9404fcfed5c21902119a1cb516d00f0aea21bcfbd0596c4",
-                    "nonce" : "0xf6eccd9c9c7395cb",
+                    "gasUsed" : "0xc350",
+                    "hash" : "0x2b894260bb78dd618d992cd029ef792cd4834eceb0ee9dce35af45caae95ba28",
+                    "mixHash" : "0x6084c056235302817a6304400dac53e5bf49b60dd64457de21444b620fd278d0",
+                    "nonce" : "0xb8fb665fe5975435",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xa5d0e8d32ee861e79b211e90c606d96e95bc73bea255ede5fb9fd90bb7cedb39",
-                    "stateRoot" : "0x0725c487930e2041eba0397686c9146c5f6febc65a64f425b8b748883d8428fc",
+                    "receiptTrie" : "0xb30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5a",
+                    "stateRoot" : "0xda427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5a2bb7c3da7b690106c8525c0fbb8488526a0c1a14b9aa5fba7057814c26031b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00725c487930e2041eba0397686c9146c5f6febc65a64f425b8b748883d8428fca05a2bb7c3da7b690106c8525c0fbb8488526a0c1a14b9aa5fba7057814c26031ba0a5d0e8d32ee861e79b211e90c606d96e95bc73bea255ede5fb9fd90bb7cedb39b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a012a9814ea6528019f9404fcfed5c21902119a1cb516d00f0aea21bcfbd0596c488f6eccd9c9c7395cbf881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca02495ab08c225a526b0d5842f144ad1122c7cdc3a1652c77cd3b085776fa4c552a0058e7e6f5b77285c12d6b587711ef9f67e7f85162f4ae9b27a29ebd97205fad2c0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a05a2bb7c3da7b690106c8525c0fbb8488526a0c1a14b9aa5fba7057814c26031ba0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a06084c056235302817a6304400dac53e5bf49b60dd64457de21444b620fd278d088b8fb665fe5975435f881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca02495ab08c225a526b0d5842f144ad1122c7cdc3a1652c77cd3b085776fa4c552a0058e7e6f5b77285c12d6b587711ef9f67e7f85162f4ae9b27a29ebd97205fad2c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -874,18 +1091,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa9e7d938bc959d0d90e55a2fd3f249c3764470a06aee47ec796c9f29a7f492cd",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x2b894260bb78dd618d992cd029ef792cd4834eceb0ee9dce35af45caae95ba28",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4c19a",
+                "balance" : "0x4563918244f4c350",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -920,7 +1130,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a44e66",
+                "balance" : "0xe8d4a44cb0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g3v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g3v1.json
index 853b40dca..b6c6e8294 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g3v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d1g3v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d1g3v1_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d1g3v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g3v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc226",
-                    "hash" : "0xdafa60f841a783525ac7c0109fe572ebeab8e713df239ca989812fd081c88815",
-                    "mixHash" : "0xed76040e1797f1c013ed7735e406846b36f9469cd347a70d19a308f3e854958a",
-                    "nonce" : "0x58e76a9251be3879",
+                    "hash" : "0x6e5348ab8b6e9fb75da3d746c705565708183fc3f073909acb273c95898f747f",
+                    "mixHash" : "0xfebe251a09805a39535858f95e245721100efb0bd46d8b7af628d5296fd81439",
+                    "nonce" : "0x6fe7990b5ff47f9e",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xc08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4c",
-                    "stateRoot" : "0xede8b4f79f3e9d00052f7a6111b2b15b7d2784ead53ac798c77024c2f0cb5b06",
+                    "receiptTrie" : "0xbe3284c0f7a475fbc5c36b9a141a86ede36cdafe3c5e0928c790f55bab94282f",
+                    "stateRoot" : "0x3213a013e840252b435ab91b5ecc837800928f2d3ccef81bdc358cbd7f78e69b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5472c96f0934909c1e1d6b4db5a0a182a65fbd0cedfba9b66c67abaf80ebabc2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ede8b4f79f3e9d00052f7a6111b2b15b7d2784ead53ac798c77024c2f0cb5b06a05472c96f0934909c1e1d6b4db5a0a182a65fbd0cedfba9b66c67abaf80ebabc2a0c08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a0ed76040e1797f1c013ed7735e406846b36f9469cd347a70d19a308f3e854958a8858e76a9251be3879f881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca03054a6fb1cf3e4e969ba1b7ec7fcab24f1222acb371031bb8c09fce09b538893a01ebbb60e0acd60b39dac0f69e2fdd1cc3fe532376741eafea0801f79d27dfddac0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03213a013e840252b435ab91b5ecc837800928f2d3ccef81bdc358cbd7f78e69ba05472c96f0934909c1e1d6b4db5a0a182a65fbd0cedfba9b66c67abaf80ebabc2a0be3284c0f7a475fbc5c36b9a141a86ede36cdafe3c5e0928c790f55bab94282fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a0febe251a09805a39535858f95e245721100efb0bd46d8b7af628d5296fd81439886fe7990b5ff47f9ef881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca03054a6fb1cf3e4e969ba1b7ec7fcab24f1222acb371031bb8c09fce09b538893a01ebbb60e0acd60b39dac0f69e2fdd1cc3fe532376741eafea0801f79d27dfddac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdafa60f841a783525ac7c0109fe572ebeab8e713df239ca989812fd081c88815",
-        "network" : "EIP150",
+        "lastblockhash" : "0x6e5348ab8b6e9fb75da3d746c705565708183fc3f073909acb273c95898f747f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c226",
                 "code" : "",
@@ -202,10 +209,220 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g3v1_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d1g3v1_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g3v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xc226",
+                    "hash" : "0xb596aac23d9a59dbda3997439c7e8e880a8ba9c2eb8dce2caa6b93cc83afee46",
+                    "mixHash" : "0x696cad7aaa68e1d51b5bc7d3fe912a47a7cc43d633152c87363d24a3f1f1d9b3",
+                    "nonce" : "0x685675b307a94761",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0xbe3284c0f7a475fbc5c36b9a141a86ede36cdafe3c5e0928c790f55bab94282f",
+                    "stateRoot" : "0x3213a013e840252b435ab91b5ecc837800928f2d3ccef81bdc358cbd7f78e69b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5472c96f0934909c1e1d6b4db5a0a182a65fbd0cedfba9b66c67abaf80ebabc2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03213a013e840252b435ab91b5ecc837800928f2d3ccef81bdc358cbd7f78e69ba05472c96f0934909c1e1d6b4db5a0a182a65fbd0cedfba9b66c67abaf80ebabc2a0be3284c0f7a475fbc5c36b9a141a86ede36cdafe3c5e0928c790f55bab94282fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a0696cad7aaa68e1d51b5bc7d3fe912a47a7cc43d633152c87363d24a3f1f1d9b388685675b307a94761f881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca03054a6fb1cf3e4e969ba1b7ec7fcab24f1222acb371031bb8c09fce09b538893a01ebbb60e0acd60b39dac0f69e2fdd1cc3fe532376741eafea0801f79d27dfddac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
+                        "gasLimit" : "0xc350",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3054a6fb1cf3e4e969ba1b7ec7fcab24f1222acb371031bb8c09fce09b538893",
+                        "s" : "0x1ebbb60e0acd60b39dac0f69e2fdd1cc3fe532376741eafea0801f79d27dfdda",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb596aac23d9a59dbda3997439c7e8e880a8ba9c2eb8dce2caa6b93cc83afee46",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c226",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a44dd0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x0a",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d1g3v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g3v1Filler.json"
         },
         "blocks" : [
@@ -217,9 +434,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc226",
-                    "hash" : "0xbffc03af593065fee1966124f509e2f0d4f11be74b60a6d733e679e21e9695de",
-                    "mixHash" : "0x7273470657fe8bcbb56d6432c361a5e9f5b5cff0acc9ed6569db83151201a423",
-                    "nonce" : "0x501128c86697c59b",
+                    "hash" : "0x5c603366f90e3b7a5cb1167e91c390f420870b4752fd796457e86a2d45defb95",
+                    "mixHash" : "0x72155ed7a5418170011d823ddbbbbde62bf9b2686331e19b273b105849545468",
+                    "nonce" : "0xaf375db20066e100",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xc08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4c",
@@ -228,7 +445,7 @@
                     "transactionsTrie" : "0x5472c96f0934909c1e1d6b4db5a0a182a65fbd0cedfba9b66c67abaf80ebabc2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ede8b4f79f3e9d00052f7a6111b2b15b7d2784ead53ac798c77024c2f0cb5b06a05472c96f0934909c1e1d6b4db5a0a182a65fbd0cedfba9b66c67abaf80ebabc2a0c08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a07273470657fe8bcbb56d6432c361a5e9f5b5cff0acc9ed6569db83151201a42388501128c86697c59bf881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca03054a6fb1cf3e4e969ba1b7ec7fcab24f1222acb371031bb8c09fce09b538893a01ebbb60e0acd60b39dac0f69e2fdd1cc3fe532376741eafea0801f79d27dfddac0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ede8b4f79f3e9d00052f7a6111b2b15b7d2784ead53ac798c77024c2f0cb5b06a05472c96f0934909c1e1d6b4db5a0a182a65fbd0cedfba9b66c67abaf80ebabc2a0c08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a072155ed7a5418170011d823ddbbbbde62bf9b2686331e19b273b10584954546888af375db20066e100f881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca03054a6fb1cf3e4e969ba1b7ec7fcab24f1222acb371031bb8c09fce09b538893a01ebbb60e0acd60b39dac0f69e2fdd1cc3fe532376741eafea0801f79d27dfddac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -265,8 +482,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbffc03af593065fee1966124f509e2f0d4f11be74b60a6d733e679e21e9695de",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5c603366f90e3b7a5cb1167e91c390f420870b4752fd796457e86a2d45defb95",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c226",
@@ -405,10 +622,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g3v1_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d1g3v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g3v1Filler.json"
         },
         "blocks" : [
@@ -419,19 +636,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xc350",
-                    "hash" : "0xdeec9afa69623776eb5d97d085aa5521018913fa04fdf75625968e15aeb34957",
-                    "mixHash" : "0x67b91ceb89d53f5c0ac8474b939beea45e6db4376ed6a450d4ced3f03c2da1dc",
-                    "nonce" : "0xeae200ecfde5e5d8",
+                    "gasUsed" : "0xc226",
+                    "hash" : "0x4b44b0cb97058a6ceef36c610eb7fde5e26cd46d86cb4641bd426abfff072c57",
+                    "mixHash" : "0xa9f3c519d467f9b56784ad4b9c32b2f3e434acf6772e974855835f6205f58abf",
+                    "nonce" : "0xbc766c414394c334",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xb30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5a",
-                    "stateRoot" : "0xda427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5",
+                    "receiptTrie" : "0xc08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4c",
+                    "stateRoot" : "0xede8b4f79f3e9d00052f7a6111b2b15b7d2784ead53ac798c77024c2f0cb5b06",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5472c96f0934909c1e1d6b4db5a0a182a65fbd0cedfba9b66c67abaf80ebabc2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a05472c96f0934909c1e1d6b4db5a0a182a65fbd0cedfba9b66c67abaf80ebabc2a0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a067b91ceb89d53f5c0ac8474b939beea45e6db4376ed6a450d4ced3f03c2da1dc88eae200ecfde5e5d8f881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca03054a6fb1cf3e4e969ba1b7ec7fcab24f1222acb371031bb8c09fce09b538893a01ebbb60e0acd60b39dac0f69e2fdd1cc3fe532376741eafea0801f79d27dfddac0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ede8b4f79f3e9d00052f7a6111b2b15b7d2784ead53ac798c77024c2f0cb5b06a05472c96f0934909c1e1d6b4db5a0a182a65fbd0cedfba9b66c67abaf80ebabc2a0c08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a0a9f3c519d467f9b56784ad4b9c32b2f3e434acf6772e974855835f6205f58abf88bc766c414394c334f881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca03054a6fb1cf3e4e969ba1b7ec7fcab24f1222acb371031bb8c09fce09b538893a01ebbb60e0acd60b39dac0f69e2fdd1cc3fe532376741eafea0801f79d27dfddac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -468,11 +685,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdeec9afa69623776eb5d97d085aa5521018913fa04fdf75625968e15aeb34957",
-        "network" : "Frontier",
+        "lastblockhash" : "0x4b44b0cb97058a6ceef36c610eb7fde5e26cd46d86cb4641bd426abfff072c57",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4c350",
+                "balance" : "0x4563918244f4c226",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,14 +724,14 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a44cb0",
+                "balance" : "0xe8d4a44dd0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
-                "balance" : "0x00",
+                "balance" : "0x0a",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
@@ -608,10 +825,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g3v1_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d1g3v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g3v1Filler.json"
         },
         "blocks" : [
@@ -623,9 +840,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc350",
-                    "hash" : "0x31e644f5e7ce63c87572de944129992a4dafab88911b6c799394172adf7540fa",
-                    "mixHash" : "0x9b9fed00604b4f3f43a2803b20d3f06c0bc4e3eaa6b95858d5a3a73778c6ca61",
-                    "nonce" : "0x6c1605ca37e125e5",
+                    "hash" : "0x1a56eacf84beb332bc9feeb5c1f8a23e45591d88eb556a5865b028c35878ec29",
+                    "mixHash" : "0xf17929c5ca4ce27892097764e95ac67825820b6cf36a46bd1b344fba5c18653a",
+                    "nonce" : "0x873b35aabebb831f",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xb30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5a",
@@ -634,7 +851,7 @@
                     "transactionsTrie" : "0x5472c96f0934909c1e1d6b4db5a0a182a65fbd0cedfba9b66c67abaf80ebabc2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a05472c96f0934909c1e1d6b4db5a0a182a65fbd0cedfba9b66c67abaf80ebabc2a0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a09b9fed00604b4f3f43a2803b20d3f06c0bc4e3eaa6b95858d5a3a73778c6ca61886c1605ca37e125e5f881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca03054a6fb1cf3e4e969ba1b7ec7fcab24f1222acb371031bb8c09fce09b538893a01ebbb60e0acd60b39dac0f69e2fdd1cc3fe532376741eafea0801f79d27dfddac0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a05472c96f0934909c1e1d6b4db5a0a182a65fbd0cedfba9b66c67abaf80ebabc2a0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a0f17929c5ca4ce27892097764e95ac67825820b6cf36a46bd1b344fba5c18653a88873b35aabebb831ff881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca03054a6fb1cf3e4e969ba1b7ec7fcab24f1222acb371031bb8c09fce09b538893a01ebbb60e0acd60b39dac0f69e2fdd1cc3fe532376741eafea0801f79d27dfddac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -671,8 +888,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x31e644f5e7ce63c87572de944129992a4dafab88911b6c799394172adf7540fa",
-        "network" : "Homestead",
+        "lastblockhash" : "0x1a56eacf84beb332bc9feeb5c1f8a23e45591d88eb556a5865b028c35878ec29",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c350",
@@ -811,10 +1028,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d1g3v1_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d1g3v1_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d1g3v1Filler.json"
         },
         "blocks" : [
@@ -825,19 +1042,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xc226",
-                    "hash" : "0xd7b46ea65aaebe0ec27ead7a5657115db97fe50d431f9dd4e44c7cf8bf373bed",
-                    "mixHash" : "0xa775e1e38122cce2ba7e0f6f694aa73a0c973bcd4317e3921a857b9819c1b8b7",
-                    "nonce" : "0xf38c3fe2e970c5a4",
+                    "gasUsed" : "0xc350",
+                    "hash" : "0x6415e79dd4424c7ecb6c665bdebbbd374080ddd18153b13b1a8761edb67f762c",
+                    "mixHash" : "0xd8e84f94733a76aa235a57791770e8370b82d4ef7f5a627abd699f71b6f93323",
+                    "nonce" : "0x7f9b2333117a2822",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xbe3284c0f7a475fbc5c36b9a141a86ede36cdafe3c5e0928c790f55bab94282f",
-                    "stateRoot" : "0x3213a013e840252b435ab91b5ecc837800928f2d3ccef81bdc358cbd7f78e69b",
+                    "receiptTrie" : "0xb30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5a",
+                    "stateRoot" : "0xda427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5472c96f0934909c1e1d6b4db5a0a182a65fbd0cedfba9b66c67abaf80ebabc2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03213a013e840252b435ab91b5ecc837800928f2d3ccef81bdc358cbd7f78e69ba05472c96f0934909c1e1d6b4db5a0a182a65fbd0cedfba9b66c67abaf80ebabc2a0be3284c0f7a475fbc5c36b9a141a86ede36cdafe3c5e0928c790f55bab94282fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a0a775e1e38122cce2ba7e0f6f694aa73a0c973bcd4317e3921a857b9819c1b8b788f38c3fe2e970c5a4f881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca03054a6fb1cf3e4e969ba1b7ec7fcab24f1222acb371031bb8c09fce09b538893a01ebbb60e0acd60b39dac0f69e2fdd1cc3fe532376741eafea0801f79d27dfddac0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a05472c96f0934909c1e1d6b4db5a0a182a65fbd0cedfba9b66c67abaf80ebabc2a0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a0d8e84f94733a76aa235a57791770e8370b82d4ef7f5a627abd699f71b6f93323887f9b2333117a2822f881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a1000000000000000000000000000000000000001ca03054a6fb1cf3e4e969ba1b7ec7fcab24f1222acb371031bb8c09fce09b538893a01ebbb60e0acd60b39dac0f69e2fdd1cc3fe532376741eafea0801f79d27dfddac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -874,18 +1091,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd7b46ea65aaebe0ec27ead7a5657115db97fe50d431f9dd4e44c7cf8bf373bed",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6415e79dd4424c7ecb6c665bdebbbd374080ddd18153b13b1a8761edb67f762c",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4c226",
+                "balance" : "0x4563918244f4c350",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -920,14 +1130,14 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a44dd0",
+                "balance" : "0xe8d4a44cb0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
-                "balance" : "0x0a",
+                "balance" : "0x00",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g0v0.json
index 90a80552c..29956ac63 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d2g0v0_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d2g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x037ee2",
-                    "hash" : "0x6eba42a84db6cbea8dfcd310975ee7f9d5ca039284a70bb59fedbdb76f5a1614",
-                    "mixHash" : "0x863583053bf62ef6c9a03fbe241e9a424cdd52799bdaddd9c3ac59dff6f22b6a",
-                    "nonce" : "0x8f13899fb6aaadde",
+                    "gasUsed" : "0x021f7f",
+                    "hash" : "0x50b42c77495dc13d9d7b9944ce38ce115658e885374c78a5a236b31a6121be80",
+                    "mixHash" : "0xe90bfc423a58fa3fe0cb75b058cf3fb1ed012f2aa0c6f0b80072220b7981b42d",
+                    "nonce" : "0x7034c22b6dd5addb",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xf0b509ab8f2e106ca609bb690dace3660f23728e3d248abab1bc62a200f8118e",
-                    "stateRoot" : "0x297e70e13ad66fbcb6d3c3b7960b65c380d6cbda0dcef7b7b5b57d38b3ad7498",
+                    "receiptTrie" : "0x75d2ca6c8aabd76d8466ea40c1eb93bd88e11ff8b909f569a499399104367fb1",
+                    "stateRoot" : "0x4204bb99846e824ee99d79eb18cebf2957f25a278ae1fd78f120d58ff5994f93",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc81c446b35f73b5129c82943d9ed3f3a394e12969244fba52b7a8c31951af779",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0297e70e13ad66fbcb6d3c3b7960b65c380d6cbda0dcef7b7b5b57d38b3ad7498a0c81c446b35f73b5129c82943d9ed3f3a394e12969244fba52b7a8c31951af779a0f0b509ab8f2e106ca609bb690dace3660f23728e3d248abab1bc62a200f8118eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083037ee28203e880a0863583053bf62ef6c9a03fbe241e9a424cdd52799bdaddd9c3ac59dff6f22b6a888f13899fb6aaaddef882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ba0a69224629c38ec1485ea2a403521e7dea0bc299892abdc270132cd152c760188a0486e7de714b86ddb1f59498523ca2a870dfc3d1990b795b95ed2fd1eceec04ddc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04204bb99846e824ee99d79eb18cebf2957f25a278ae1fd78f120d58ff5994f93a0c81c446b35f73b5129c82943d9ed3f3a394e12969244fba52b7a8c31951af779a075d2ca6c8aabd76d8466ea40c1eb93bd88e11ff8b909f569a499399104367fb1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021f7f8203e880a0e90bfc423a58fa3fe0cb75b058cf3fb1ed012f2aa0c6f0b80072220b7981b42d887034c22b6dd5addbf882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ba0a69224629c38ec1485ea2a403521e7dea0bc299892abdc270132cd152c760188a0486e7de714b86ddb1f59498523ca2a870dfc3d1990b795b95ed2fd1eceec04ddc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6eba42a84db6cbea8dfcd310975ee7f9d5ca039284a70bb59fedbdb76f5a1614",
-        "network" : "EIP150",
+        "lastblockhash" : "0x50b42c77495dc13d9d7b9944ce38ce115658e885374c78a5a236b31a6121be80",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f77ee2",
+                "balance" : "0x4563918244f61f7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -103,7 +110,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a1911e",
+                "balance" : "0xe8d4a2f081",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -204,10 +211,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g0v0_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d2g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -218,19 +225,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x037ee2",
-                    "hash" : "0x4eaed2d9d6064dff973a40120e88683ffc774b8d5ffceff708c0a175e691d48b",
-                    "mixHash" : "0x04eda27b88d2b1b704b690105ed0704fa687eba303d623bef2f3fbb5af4cd88f",
-                    "nonce" : "0x8f8e3607da9913a5",
+                    "gasUsed" : "0x021f7f",
+                    "hash" : "0x75d1b3402a4e476804b8fbd5fb24b4ba925231e2bfced4cbe537997129f39a17",
+                    "mixHash" : "0xa1bce07ed479ee3d0c459142e7923c1499b2f33fe15c924597c824e1d21355b9",
+                    "nonce" : "0xd79dcf3b1b0e15ec",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xf0b509ab8f2e106ca609bb690dace3660f23728e3d248abab1bc62a200f8118e",
-                    "stateRoot" : "0x297e70e13ad66fbcb6d3c3b7960b65c380d6cbda0dcef7b7b5b57d38b3ad7498",
+                    "receiptTrie" : "0x75d2ca6c8aabd76d8466ea40c1eb93bd88e11ff8b909f569a499399104367fb1",
+                    "stateRoot" : "0x4204bb99846e824ee99d79eb18cebf2957f25a278ae1fd78f120d58ff5994f93",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc81c446b35f73b5129c82943d9ed3f3a394e12969244fba52b7a8c31951af779",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0297e70e13ad66fbcb6d3c3b7960b65c380d6cbda0dcef7b7b5b57d38b3ad7498a0c81c446b35f73b5129c82943d9ed3f3a394e12969244fba52b7a8c31951af779a0f0b509ab8f2e106ca609bb690dace3660f23728e3d248abab1bc62a200f8118eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083037ee28203e880a004eda27b88d2b1b704b690105ed0704fa687eba303d623bef2f3fbb5af4cd88f888f8e3607da9913a5f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ba0a69224629c38ec1485ea2a403521e7dea0bc299892abdc270132cd152c760188a0486e7de714b86ddb1f59498523ca2a870dfc3d1990b795b95ed2fd1eceec04ddc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04204bb99846e824ee99d79eb18cebf2957f25a278ae1fd78f120d58ff5994f93a0c81c446b35f73b5129c82943d9ed3f3a394e12969244fba52b7a8c31951af779a075d2ca6c8aabd76d8466ea40c1eb93bd88e11ff8b909f569a499399104367fb1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021f7f8203e880a0a1bce07ed479ee3d0c459142e7923c1499b2f33fe15c924597c824e1d21355b988d79dcf3b1b0e15ecf882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ba0a69224629c38ec1485ea2a403521e7dea0bc299892abdc270132cd152c760188a0486e7de714b86ddb1f59498523ca2a870dfc3d1990b795b95ed2fd1eceec04ddc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -267,11 +274,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4eaed2d9d6064dff973a40120e88683ffc774b8d5ffceff708c0a175e691d48b",
-        "network" : "EIP158",
+        "lastblockhash" : "0x75d1b3402a4e476804b8fbd5fb24b4ba925231e2bfced4cbe537997129f39a17",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f77ee2",
+                "balance" : "0x4563918244f61f7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -308,7 +322,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a1911e",
+                "balance" : "0xe8d4a2f081",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -409,10 +423,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g0v0_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d2g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -423,19 +437,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x044aa7",
-                    "hash" : "0x46b549f0d851c8fc3d77a23701f17a811f510d9381cdc7754812254ef2743cdd",
-                    "mixHash" : "0xd12cb4b01c54cca1853db410919a58fc39cadb044bcce83d42cc1e1e79c3549c",
-                    "nonce" : "0xe200ab8ab4007e28",
+                    "gasUsed" : "0x037ee2",
+                    "hash" : "0x4f8275fde844126b24b6b626711ce7e70b27c86be2f7d5ce421f7a81160c58ba",
+                    "mixHash" : "0x78eb91018c0ef893550b0b8237baeda6719e8ca79cbccd3c151d3d7a003ca204",
+                    "nonce" : "0x96ba80f5c30353b2",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xdd39375edad83f16cc7af96f42309e35a81f090021f77b50ee8adee46895cac5",
-                    "stateRoot" : "0xf4b80b3da15a10d955c11c8eb42fd4676e99032f5e6b959776ab5c54789ad4ff",
+                    "receiptTrie" : "0xf0b509ab8f2e106ca609bb690dace3660f23728e3d248abab1bc62a200f8118e",
+                    "stateRoot" : "0x297e70e13ad66fbcb6d3c3b7960b65c380d6cbda0dcef7b7b5b57d38b3ad7498",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc81c446b35f73b5129c82943d9ed3f3a394e12969244fba52b7a8c31951af779",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f4b80b3da15a10d955c11c8eb42fd4676e99032f5e6b959776ab5c54789ad4ffa0c81c446b35f73b5129c82943d9ed3f3a394e12969244fba52b7a8c31951af779a0dd39375edad83f16cc7af96f42309e35a81f090021f77b50ee8adee46895cac5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083044aa78203e880a0d12cb4b01c54cca1853db410919a58fc39cadb044bcce83d42cc1e1e79c3549c88e200ab8ab4007e28f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ba0a69224629c38ec1485ea2a403521e7dea0bc299892abdc270132cd152c760188a0486e7de714b86ddb1f59498523ca2a870dfc3d1990b795b95ed2fd1eceec04ddc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0297e70e13ad66fbcb6d3c3b7960b65c380d6cbda0dcef7b7b5b57d38b3ad7498a0c81c446b35f73b5129c82943d9ed3f3a394e12969244fba52b7a8c31951af779a0f0b509ab8f2e106ca609bb690dace3660f23728e3d248abab1bc62a200f8118eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083037ee28203e880a078eb91018c0ef893550b0b8237baeda6719e8ca79cbccd3c151d3d7a003ca2048896ba80f5c30353b2f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ba0a69224629c38ec1485ea2a403521e7dea0bc299892abdc270132cd152c760188a0486e7de714b86ddb1f59498523ca2a870dfc3d1990b795b95ed2fd1eceec04ddc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -472,11 +486,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x46b549f0d851c8fc3d77a23701f17a811f510d9381cdc7754812254ef2743cdd",
-        "network" : "Frontier",
+        "lastblockhash" : "0x4f8275fde844126b24b6b626711ce7e70b27c86be2f7d5ce421f7a81160c58ba",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f84aa7",
+                "balance" : "0x4563918244f77ee2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -501,6 +515,8 @@
                 "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c"
                 }
             },
             "0xa300000000000000000000000000000000000000" : {
@@ -511,7 +527,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a0c559",
+                "balance" : "0xe8d4a1911e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -612,10 +628,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g0v0_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d2g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -626,19 +642,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x037492",
-                    "hash" : "0x5392e9f840d8d93f5f205a758b0ce6c6f67120ac04cb1a7fe841407abd78fbbe",
-                    "mixHash" : "0x736aa069b66c036bf29e94be6d64c762fb90b875fded4be5fa3fb442818cad82",
-                    "nonce" : "0x481c326d5c7ddfb3",
+                    "gasUsed" : "0x037ee2",
+                    "hash" : "0x8b728a3de7bea6d15edb1922ac73181d6c7f305b69c678a6a44b822c2f5f6e29",
+                    "mixHash" : "0xf606fd44813da1fe84cb6b7f0caee95fba4b8d3a0d3a5b78f39b3faa6230f33d",
+                    "nonce" : "0x31da1da560caee6e",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xb99ce387c6a7bb7b2ce8eae6fe9b2221b0e90d929dc40e09d25c3dc69697f417",
-                    "stateRoot" : "0xcf9c47a1fd3d92a63627b24912c2d2e0f85018886dd96e71f30ecd8badffb70b",
+                    "receiptTrie" : "0xf0b509ab8f2e106ca609bb690dace3660f23728e3d248abab1bc62a200f8118e",
+                    "stateRoot" : "0x297e70e13ad66fbcb6d3c3b7960b65c380d6cbda0dcef7b7b5b57d38b3ad7498",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc81c446b35f73b5129c82943d9ed3f3a394e12969244fba52b7a8c31951af779",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf9c47a1fd3d92a63627b24912c2d2e0f85018886dd96e71f30ecd8badffb70ba0c81c446b35f73b5129c82943d9ed3f3a394e12969244fba52b7a8c31951af779a0b99ce387c6a7bb7b2ce8eae6fe9b2221b0e90d929dc40e09d25c3dc69697f417b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830374928203e880a0736aa069b66c036bf29e94be6d64c762fb90b875fded4be5fa3fb442818cad8288481c326d5c7ddfb3f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ba0a69224629c38ec1485ea2a403521e7dea0bc299892abdc270132cd152c760188a0486e7de714b86ddb1f59498523ca2a870dfc3d1990b795b95ed2fd1eceec04ddc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0297e70e13ad66fbcb6d3c3b7960b65c380d6cbda0dcef7b7b5b57d38b3ad7498a0c81c446b35f73b5129c82943d9ed3f3a394e12969244fba52b7a8c31951af779a0f0b509ab8f2e106ca609bb690dace3660f23728e3d248abab1bc62a200f8118eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083037ee28203e880a0f606fd44813da1fe84cb6b7f0caee95fba4b8d3a0d3a5b78f39b3faa6230f33d8831da1da560caee6ef882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ba0a69224629c38ec1485ea2a403521e7dea0bc299892abdc270132cd152c760188a0486e7de714b86ddb1f59498523ca2a870dfc3d1990b795b95ed2fd1eceec04ddc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -675,11 +691,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5392e9f840d8d93f5f205a758b0ce6c6f67120ac04cb1a7fe841407abd78fbbe",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8b728a3de7bea6d15edb1922ac73181d6c7f305b69c678a6a44b822c2f5f6e29",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f77492",
+                "balance" : "0x4563918244f77ee2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -716,7 +732,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a19b6e",
+                "balance" : "0xe8d4a1911e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -817,10 +833,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g0v0_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d2g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -831,19 +847,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x021f7f",
-                    "hash" : "0x34754f31bdb5ec8d71f0f75103c60abd9dc32157b69ce077f30da28a90f06e27",
-                    "mixHash" : "0xfccd7b0997841c5496eb5f6e722bf191c574f9444a7e6146474661582c5c777e",
-                    "nonce" : "0x82d3daf6eeea7051",
+                    "gasUsed" : "0x044aa7",
+                    "hash" : "0x52b21902553afca9da1f2856919b30ccc9ff56387bddeb2e04de34c88bdb5190",
+                    "mixHash" : "0x0e75b769c1ee975b662fc2c7c28b71b131f5b6a54cf3f97fe919f8e7a67c9201",
+                    "nonce" : "0x79a98fcc6846954b",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x75d2ca6c8aabd76d8466ea40c1eb93bd88e11ff8b909f569a499399104367fb1",
-                    "stateRoot" : "0x4204bb99846e824ee99d79eb18cebf2957f25a278ae1fd78f120d58ff5994f93",
+                    "receiptTrie" : "0xdd39375edad83f16cc7af96f42309e35a81f090021f77b50ee8adee46895cac5",
+                    "stateRoot" : "0xf4b80b3da15a10d955c11c8eb42fd4676e99032f5e6b959776ab5c54789ad4ff",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc81c446b35f73b5129c82943d9ed3f3a394e12969244fba52b7a8c31951af779",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04204bb99846e824ee99d79eb18cebf2957f25a278ae1fd78f120d58ff5994f93a0c81c446b35f73b5129c82943d9ed3f3a394e12969244fba52b7a8c31951af779a075d2ca6c8aabd76d8466ea40c1eb93bd88e11ff8b909f569a499399104367fb1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021f7f8203e880a0fccd7b0997841c5496eb5f6e722bf191c574f9444a7e6146474661582c5c777e8882d3daf6eeea7051f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ba0a69224629c38ec1485ea2a403521e7dea0bc299892abdc270132cd152c760188a0486e7de714b86ddb1f59498523ca2a870dfc3d1990b795b95ed2fd1eceec04ddc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f4b80b3da15a10d955c11c8eb42fd4676e99032f5e6b959776ab5c54789ad4ffa0c81c446b35f73b5129c82943d9ed3f3a394e12969244fba52b7a8c31951af779a0dd39375edad83f16cc7af96f42309e35a81f090021f77b50ee8adee46895cac5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083044aa78203e880a00e75b769c1ee975b662fc2c7c28b71b131f5b6a54cf3f97fe919f8e7a67c92018879a98fcc6846954bf882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ba0a69224629c38ec1485ea2a403521e7dea0bc299892abdc270132cd152c760188a0486e7de714b86ddb1f59498523ca2a870dfc3d1990b795b95ed2fd1eceec04ddc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -880,18 +896,214 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x34754f31bdb5ec8d71f0f75103c60abd9dc32157b69ce077f30da28a90f06e27",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x52b21902553afca9da1f2856919b30ccc9ff56387bddeb2e04de34c88bdb5190",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f84aa7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a0c559",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d2g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x037492",
+                    "hash" : "0xe06dac43630c3f9b182c874f1262d5e576c42b82a565e43d38e2d962f6652b9d",
+                    "mixHash" : "0x73962d804ad1a12b82b67cdadc08a88211f5b2a6592ad4121886e590a69f34af",
+                    "nonce" : "0x6115888fbeb6e890",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0xb99ce387c6a7bb7b2ce8eae6fe9b2221b0e90d929dc40e09d25c3dc69697f417",
+                    "stateRoot" : "0xcf9c47a1fd3d92a63627b24912c2d2e0f85018886dd96e71f30ecd8badffb70b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc81c446b35f73b5129c82943d9ed3f3a394e12969244fba52b7a8c31951af779",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf9c47a1fd3d92a63627b24912c2d2e0f85018886dd96e71f30ecd8badffb70ba0c81c446b35f73b5129c82943d9ed3f3a394e12969244fba52b7a8c31951af779a0b99ce387c6a7bb7b2ce8eae6fe9b2221b0e90d929dc40e09d25c3dc69697f417b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830374928203e880a073962d804ad1a12b82b67cdadc08a88211f5b2a6592ad4121886e590a69f34af886115888fbeb6e890f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ba0a69224629c38ec1485ea2a403521e7dea0bc299892abdc270132cd152c760188a0486e7de714b86ddb1f59498523ca2a870dfc3d1990b795b95ed2fd1eceec04ddc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
+                        "gasLimit" : "0x0c3500",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa69224629c38ec1485ea2a403521e7dea0bc299892abdc270132cd152c760188",
+                        "s" : "0x486e7de714b86ddb1f59498523ca2a870dfc3d1990b795b95ed2fd1eceec04dd",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe06dac43630c3f9b182c874f1262d5e576c42b82a565e43d38e2d962f6652b9d",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f61f7f",
+                "balance" : "0x4563918244f77492",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -928,7 +1140,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2f081",
+                "balance" : "0xe8d4a19b6e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g0v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g0v1.json
index 836d0bd72..ddf14538d 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g0v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g0v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d2g0v1_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d2g0v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g0v1Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x03990e",
-                    "hash" : "0x14a7fcc3c5ec0bbed7f3f0361cb0cbb998c9ca127bb89a73d1827db96863244d",
-                    "mixHash" : "0x6df939c87c259847595de61418f3637be3b096cb51dd51d36962cfa9b69037f8",
-                    "nonce" : "0xd89abc2bf976a6e9",
+                    "gasUsed" : "0x0239ab",
+                    "hash" : "0xc15bb0378905580e98cb775ba476af4da1c3caebe716f8142f277ec16e52d846",
+                    "mixHash" : "0xbb5cd5b121bbc06741bbe30e051cc717a4e70d487e75fdc881329d2adcfc9358",
+                    "nonce" : "0x4411e810335709ce",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xe95ae37287a5c68b3a0d2199e665dea2fbcd9e5dfdc785fe9593a29ec7b9c95c",
-                    "stateRoot" : "0x598162e5677079a4b4fcc509a3b3600b4e07f15e7eb9f529be857a5ef1a341ba",
+                    "receiptTrie" : "0x786f50ef0f9058903c2f60c0435d2be9c367ce7c75e807be848e1049fa606652",
+                    "stateRoot" : "0xcee2515918e31edbd2caabe21f13a44e3245943c7c5a7926448f3792288017e5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xca5a0c1fc51f41c19943506b449fb41f7ded935bbba184f3bfcb396a0cb465da",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0598162e5677079a4b4fcc509a3b3600b4e07f15e7eb9f529be857a5ef1a341baa0ca5a0c1fc51f41c19943506b449fb41f7ded935bbba184f3bfcb396a0cb465daa0e95ae37287a5c68b3a0d2199e665dea2fbcd9e5dfdc785fe9593a29ec7b9c95cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808303990e8203e880a06df939c87c259847595de61418f3637be3b096cb51dd51d36962cfa9b69037f888d89abc2bf976a6e9f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba0b88ffab673d6401c5b775b2611bbf29a72e396cff328525c2a2ae53b6c836247a03d42015daa3cdc77263a7b76e4bcfc0e514b08d9fd2a2112ef57aaf71fc4d16ac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cee2515918e31edbd2caabe21f13a44e3245943c7c5a7926448f3792288017e5a0ca5a0c1fc51f41c19943506b449fb41f7ded935bbba184f3bfcb396a0cb465daa0786f50ef0f9058903c2f60c0435d2be9c367ce7c75e807be848e1049fa606652b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239ab8203e880a0bb5cd5b121bbc06741bbe30e051cc717a4e70d487e75fdc881329d2adcfc9358884411e810335709cef882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba0b88ffab673d6401c5b775b2611bbf29a72e396cff328525c2a2ae53b6c836247a03d42015daa3cdc77263a7b76e4bcfc0e514b08d9fd2a2112ef57aaf71fc4d16ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x14a7fcc3c5ec0bbed7f3f0361cb0cbb998c9ca127bb89a73d1827db96863244d",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc15bb0378905580e98cb775ba476af4da1c3caebe716f8142f277ec16e52d846",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f7990e",
+                "balance" : "0x4563918244f639ab",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -103,7 +110,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a176e8",
+                "balance" : "0xe8d4a2d64b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -204,10 +211,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g0v1_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d2g0v1_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g0v1Filler.json"
         },
         "blocks" : [
@@ -218,19 +225,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x03990e",
-                    "hash" : "0x8f4379c0deb66e5e5a55ad2034ba38db660d269bf05692fa01c1661bb99cdb3d",
-                    "mixHash" : "0x68beaa36828ecd51692e87c71ebeec68c9f8b9028170cdd8acee97fa94a5c981",
-                    "nonce" : "0xd63f6e296c929456",
+                    "gasUsed" : "0x0239ab",
+                    "hash" : "0x865607c3dda56b4fe217d7cb8199e7fc7834c4e9f661329be85a7a8cc50ebf00",
+                    "mixHash" : "0xd2f082ab16292abd404bf81af654bbd3e1b3e90f4184018bbd882ed33b8caf0b",
+                    "nonce" : "0xe797f502e81b5ed3",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xe95ae37287a5c68b3a0d2199e665dea2fbcd9e5dfdc785fe9593a29ec7b9c95c",
-                    "stateRoot" : "0x598162e5677079a4b4fcc509a3b3600b4e07f15e7eb9f529be857a5ef1a341ba",
+                    "receiptTrie" : "0x786f50ef0f9058903c2f60c0435d2be9c367ce7c75e807be848e1049fa606652",
+                    "stateRoot" : "0xcee2515918e31edbd2caabe21f13a44e3245943c7c5a7926448f3792288017e5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xca5a0c1fc51f41c19943506b449fb41f7ded935bbba184f3bfcb396a0cb465da",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0598162e5677079a4b4fcc509a3b3600b4e07f15e7eb9f529be857a5ef1a341baa0ca5a0c1fc51f41c19943506b449fb41f7ded935bbba184f3bfcb396a0cb465daa0e95ae37287a5c68b3a0d2199e665dea2fbcd9e5dfdc785fe9593a29ec7b9c95cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808303990e8203e880a068beaa36828ecd51692e87c71ebeec68c9f8b9028170cdd8acee97fa94a5c98188d63f6e296c929456f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba0b88ffab673d6401c5b775b2611bbf29a72e396cff328525c2a2ae53b6c836247a03d42015daa3cdc77263a7b76e4bcfc0e514b08d9fd2a2112ef57aaf71fc4d16ac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cee2515918e31edbd2caabe21f13a44e3245943c7c5a7926448f3792288017e5a0ca5a0c1fc51f41c19943506b449fb41f7ded935bbba184f3bfcb396a0cb465daa0786f50ef0f9058903c2f60c0435d2be9c367ce7c75e807be848e1049fa606652b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239ab8203e880a0d2f082ab16292abd404bf81af654bbd3e1b3e90f4184018bbd882ed33b8caf0b88e797f502e81b5ed3f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba0b88ffab673d6401c5b775b2611bbf29a72e396cff328525c2a2ae53b6c836247a03d42015daa3cdc77263a7b76e4bcfc0e514b08d9fd2a2112ef57aaf71fc4d16ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -267,11 +274,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8f4379c0deb66e5e5a55ad2034ba38db660d269bf05692fa01c1661bb99cdb3d",
-        "network" : "EIP158",
+        "lastblockhash" : "0x865607c3dda56b4fe217d7cb8199e7fc7834c4e9f661329be85a7a8cc50ebf00",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f7990e",
+                "balance" : "0x4563918244f639ab",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -308,7 +322,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a176e8",
+                "balance" : "0xe8d4a2d64b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -409,10 +423,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g0v1_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d2g0v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g0v1Filler.json"
         },
         "blocks" : [
@@ -423,19 +437,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x046dcf",
-                    "hash" : "0x1732d5c67b25bb88fa60b2d091565b06b8c4e501b3390319464e139f6dc56204",
-                    "mixHash" : "0x6b6905cb4793eb2d874a728363820f611bf62450c392399602e1f0012aa407de",
-                    "nonce" : "0xf10787c5947db7ec",
+                    "gasUsed" : "0x03990e",
+                    "hash" : "0x6d10cac7d769336cf44522e6f81d2b91de69818d6ff5f7b8ad01554308633c7f",
+                    "mixHash" : "0x77fe9bd624646293515a3a3ed81fed463cba44bc61de71c1795388eb6d5cd2dc",
+                    "nonce" : "0x23797ec05e8d1c91",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x21d1cbb68c10b642696984267d5e668daba80dda5858b3079549027e0db5cca9",
-                    "stateRoot" : "0x053ba5fc619833abbc2c2ad4f33ace4e843ef499927baee5e628bb2ee54f289e",
+                    "receiptTrie" : "0xe95ae37287a5c68b3a0d2199e665dea2fbcd9e5dfdc785fe9593a29ec7b9c95c",
+                    "stateRoot" : "0x598162e5677079a4b4fcc509a3b3600b4e07f15e7eb9f529be857a5ef1a341ba",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xca5a0c1fc51f41c19943506b449fb41f7ded935bbba184f3bfcb396a0cb465da",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0053ba5fc619833abbc2c2ad4f33ace4e843ef499927baee5e628bb2ee54f289ea0ca5a0c1fc51f41c19943506b449fb41f7ded935bbba184f3bfcb396a0cb465daa021d1cbb68c10b642696984267d5e668daba80dda5858b3079549027e0db5cca9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083046dcf8203e880a06b6905cb4793eb2d874a728363820f611bf62450c392399602e1f0012aa407de88f10787c5947db7ecf882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba0b88ffab673d6401c5b775b2611bbf29a72e396cff328525c2a2ae53b6c836247a03d42015daa3cdc77263a7b76e4bcfc0e514b08d9fd2a2112ef57aaf71fc4d16ac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0598162e5677079a4b4fcc509a3b3600b4e07f15e7eb9f529be857a5ef1a341baa0ca5a0c1fc51f41c19943506b449fb41f7ded935bbba184f3bfcb396a0cb465daa0e95ae37287a5c68b3a0d2199e665dea2fbcd9e5dfdc785fe9593a29ec7b9c95cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808303990e8203e880a077fe9bd624646293515a3a3ed81fed463cba44bc61de71c1795388eb6d5cd2dc8823797ec05e8d1c91f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba0b88ffab673d6401c5b775b2611bbf29a72e396cff328525c2a2ae53b6c836247a03d42015daa3cdc77263a7b76e4bcfc0e514b08d9fd2a2112ef57aaf71fc4d16ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -472,11 +486,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1732d5c67b25bb88fa60b2d091565b06b8c4e501b3390319464e139f6dc56204",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6d10cac7d769336cf44522e6f81d2b91de69818d6ff5f7b8ad01554308633c7f",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f86dcf",
+                "balance" : "0x4563918244f7990e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -497,10 +511,12 @@
                 }
             },
             "0xa200000000000000000000000000000000000000" : {
-                "balance" : "0x00",
+                "balance" : "0x0a",
                 "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c"
                 }
             },
             "0xa300000000000000000000000000000000000000" : {
@@ -511,14 +527,14 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a0a227",
+                "balance" : "0xe8d4a176e8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
-                "balance" : "0x0a",
+                "balance" : "0x00",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
@@ -612,10 +628,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g0v1_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d2g0v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g0v1Filler.json"
         },
         "blocks" : [
@@ -626,19 +642,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x038ebe",
-                    "hash" : "0xd2b66e64b54280b10b05211f42dcca31a6bcb07cf8333b55c2defb01ee4a15e5",
-                    "mixHash" : "0xff7cbc823d98535f1348485c2969128061711037507153a3c2a8b68dfd73a789",
-                    "nonce" : "0xa6290d62b1750169",
+                    "gasUsed" : "0x03990e",
+                    "hash" : "0x9853604cdf128c8047ed6627be40a4cd7ae91ba8b85db6ac3dfcbed961770258",
+                    "mixHash" : "0xd7cf9ae5305b7025c419512cd8d99ba08d714c103abaa3d9687c1f9eac065832",
+                    "nonce" : "0xa6b75b537a50e5f8",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x0991ad8e8848dd619f67248e44ec137785f0ed2859e68ac38c396e17251c5b54",
-                    "stateRoot" : "0xd870b39f179bded34bf16c7e6d161e3342aee7578299bc62a9792fdc95346030",
+                    "receiptTrie" : "0xe95ae37287a5c68b3a0d2199e665dea2fbcd9e5dfdc785fe9593a29ec7b9c95c",
+                    "stateRoot" : "0x598162e5677079a4b4fcc509a3b3600b4e07f15e7eb9f529be857a5ef1a341ba",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xca5a0c1fc51f41c19943506b449fb41f7ded935bbba184f3bfcb396a0cb465da",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d870b39f179bded34bf16c7e6d161e3342aee7578299bc62a9792fdc95346030a0ca5a0c1fc51f41c19943506b449fb41f7ded935bbba184f3bfcb396a0cb465daa00991ad8e8848dd619f67248e44ec137785f0ed2859e68ac38c396e17251c5b54b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083038ebe8203e880a0ff7cbc823d98535f1348485c2969128061711037507153a3c2a8b68dfd73a78988a6290d62b1750169f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba0b88ffab673d6401c5b775b2611bbf29a72e396cff328525c2a2ae53b6c836247a03d42015daa3cdc77263a7b76e4bcfc0e514b08d9fd2a2112ef57aaf71fc4d16ac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0598162e5677079a4b4fcc509a3b3600b4e07f15e7eb9f529be857a5ef1a341baa0ca5a0c1fc51f41c19943506b449fb41f7ded935bbba184f3bfcb396a0cb465daa0e95ae37287a5c68b3a0d2199e665dea2fbcd9e5dfdc785fe9593a29ec7b9c95cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808303990e8203e880a0d7cf9ae5305b7025c419512cd8d99ba08d714c103abaa3d9687c1f9eac06583288a6b75b537a50e5f8f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba0b88ffab673d6401c5b775b2611bbf29a72e396cff328525c2a2ae53b6c836247a03d42015daa3cdc77263a7b76e4bcfc0e514b08d9fd2a2112ef57aaf71fc4d16ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -675,11 +691,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd2b66e64b54280b10b05211f42dcca31a6bcb07cf8333b55c2defb01ee4a15e5",
-        "network" : "Homestead",
+        "lastblockhash" : "0x9853604cdf128c8047ed6627be40a4cd7ae91ba8b85db6ac3dfcbed961770258",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f78ebe",
+                "balance" : "0x4563918244f7990e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -716,7 +732,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a18138",
+                "balance" : "0xe8d4a176e8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -817,10 +833,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g0v1_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d2g0v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g0v1Filler.json"
         },
         "blocks" : [
@@ -831,19 +847,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0239ab",
-                    "hash" : "0x7c3e628abed6d6ebb3175ee8867674eef448c1658a03e764985f2316caeb6454",
-                    "mixHash" : "0xfc9167c41ac7797ff7a2ce86b91548069ba65cb393458147b1eec52d0c5895bc",
-                    "nonce" : "0x3bc7c76684056b0e",
+                    "gasUsed" : "0x046dcf",
+                    "hash" : "0x3ce5efbe07ce212a05852d311c0082eb9ea7e4d5e73dec67c3c8c6bca3592654",
+                    "mixHash" : "0xff85de04f4052f90b8cf0a137a70500005141b8dafa5819d2bace42e67c98fa0",
+                    "nonce" : "0x09ef2f02c9b07832",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x786f50ef0f9058903c2f60c0435d2be9c367ce7c75e807be848e1049fa606652",
-                    "stateRoot" : "0xcee2515918e31edbd2caabe21f13a44e3245943c7c5a7926448f3792288017e5",
+                    "receiptTrie" : "0x21d1cbb68c10b642696984267d5e668daba80dda5858b3079549027e0db5cca9",
+                    "stateRoot" : "0x053ba5fc619833abbc2c2ad4f33ace4e843ef499927baee5e628bb2ee54f289e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xca5a0c1fc51f41c19943506b449fb41f7ded935bbba184f3bfcb396a0cb465da",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cee2515918e31edbd2caabe21f13a44e3245943c7c5a7926448f3792288017e5a0ca5a0c1fc51f41c19943506b449fb41f7ded935bbba184f3bfcb396a0cb465daa0786f50ef0f9058903c2f60c0435d2be9c367ce7c75e807be848e1049fa606652b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239ab8203e880a0fc9167c41ac7797ff7a2ce86b91548069ba65cb393458147b1eec52d0c5895bc883bc7c76684056b0ef882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba0b88ffab673d6401c5b775b2611bbf29a72e396cff328525c2a2ae53b6c836247a03d42015daa3cdc77263a7b76e4bcfc0e514b08d9fd2a2112ef57aaf71fc4d16ac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0053ba5fc619833abbc2c2ad4f33ace4e843ef499927baee5e628bb2ee54f289ea0ca5a0c1fc51f41c19943506b449fb41f7ded935bbba184f3bfcb396a0cb465daa021d1cbb68c10b642696984267d5e668daba80dda5858b3079549027e0db5cca9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083046dcf8203e880a0ff85de04f4052f90b8cf0a137a70500005141b8dafa5819d2bace42e67c98fa08809ef2f02c9b07832f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba0b88ffab673d6401c5b775b2611bbf29a72e396cff328525c2a2ae53b6c836247a03d42015daa3cdc77263a7b76e4bcfc0e514b08d9fd2a2112ef57aaf71fc4d16ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -880,18 +896,214 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7c3e628abed6d6ebb3175ee8867674eef448c1658a03e764985f2316caeb6454",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x3ce5efbe07ce212a05852d311c0082eb9ea7e4d5e73dec67c3c8c6bca3592654",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f86dcf",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a0a227",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x0a",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d2g0v1_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g0v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x038ebe",
+                    "hash" : "0xd6a6eacdbb5f680aabe0bff4a6f5a985a41b440ed619d99438b27ea284967bf6",
+                    "mixHash" : "0x8daf84147d3764f1e42809476866201806098feb207c40788dec6b4f5e32580c",
+                    "nonce" : "0x7def79131097c246",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0x0991ad8e8848dd619f67248e44ec137785f0ed2859e68ac38c396e17251c5b54",
+                    "stateRoot" : "0xd870b39f179bded34bf16c7e6d161e3342aee7578299bc62a9792fdc95346030",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xca5a0c1fc51f41c19943506b449fb41f7ded935bbba184f3bfcb396a0cb465da",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d870b39f179bded34bf16c7e6d161e3342aee7578299bc62a9792fdc95346030a0ca5a0c1fc51f41c19943506b449fb41f7ded935bbba184f3bfcb396a0cb465daa00991ad8e8848dd619f67248e44ec137785f0ed2859e68ac38c396e17251c5b54b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083038ebe8203e880a08daf84147d3764f1e42809476866201806098feb207c40788dec6b4f5e32580c887def79131097c246f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba0b88ffab673d6401c5b775b2611bbf29a72e396cff328525c2a2ae53b6c836247a03d42015daa3cdc77263a7b76e4bcfc0e514b08d9fd2a2112ef57aaf71fc4d16ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
+                        "gasLimit" : "0x0c3500",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb88ffab673d6401c5b775b2611bbf29a72e396cff328525c2a2ae53b6c836247",
+                        "s" : "0x3d42015daa3cdc77263a7b76e4bcfc0e514b08d9fd2a2112ef57aaf71fc4d16a",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd6a6eacdbb5f680aabe0bff4a6f5a985a41b440ed619d99438b27ea284967bf6",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f639ab",
+                "balance" : "0x4563918244f78ebe",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -928,7 +1140,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2d64b",
+                "balance" : "0xe8d4a18138",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g1v0.json
index 205eff47d..17135ef86 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d2g1v0_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d2g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x021bab",
-                    "hash" : "0xca284131d07f03ff48e8fc621546fde83ec875c41fb49475d5ec96bcb8b052fa",
-                    "mixHash" : "0xe50da41672b6ffbbcd0d7079e2d16936a7141c3506481fe1a8687b02f1189ac7",
-                    "nonce" : "0x9eef2f5f96cabfc9",
+                    "hash" : "0x98e01624725021b43b0079d78c4946081abf3727a6445f1c2e971046e7493541",
+                    "mixHash" : "0x97052111eda6813fd075281744db58f91959ce032046b08cc6118a162cd1d198",
+                    "nonce" : "0xe824c806d5182a37",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248",
-                    "stateRoot" : "0xa27bd406ba7bfcfa53658aeb61745209354cfd1bf2e7b109f3d0e505239cf53d",
+                    "receiptTrie" : "0x53676617105e409ad2fa2ca6c10cff34c7e103bb501f2af60fd65b5311754d2c",
+                    "stateRoot" : "0x8964f2826c5f39086e6c7bde2870c0c9ceb501008c4794d50dcea2e485ec7013",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x496f19ec0509dacf7dbe406c36d51bddf9598e567abf443c2a4a25bf157530eb",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a27bd406ba7bfcfa53658aeb61745209354cfd1bf2e7b109f3d0e505239cf53da0496f19ec0509dacf7dbe406c36d51bddf9598e567abf443c2a4a25bf157530eba0974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a0e50da41672b6ffbbcd0d7079e2d16936a7141c3506481fe1a8687b02f1189ac7889eef2f5f96cabfc9f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca08b635b43f942c8ac5d3f8b0e87e998f946ad7b93a211e4ebfd251ea720075a6ba02c5d4e6d0b24fa9978582c5cc49b744e95293e082352c7949efb3763fa57baeac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08964f2826c5f39086e6c7bde2870c0c9ceb501008c4794d50dcea2e485ec7013a0496f19ec0509dacf7dbe406c36d51bddf9598e567abf443c2a4a25bf157530eba053676617105e409ad2fa2ca6c10cff34c7e103bb501f2af60fd65b5311754d2cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a097052111eda6813fd075281744db58f91959ce032046b08cc6118a162cd1d19888e824c806d5182a37f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca08b635b43f942c8ac5d3f8b0e87e998f946ad7b93a211e4ebfd251ea720075a6ba02c5d4e6d0b24fa9978582c5cc49b744e95293e082352c7949efb3763fa57baeac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xca284131d07f03ff48e8fc621546fde83ec875c41fb49475d5ec96bcb8b052fa",
-        "network" : "EIP150",
+        "lastblockhash" : "0x98e01624725021b43b0079d78c4946081abf3727a6445f1c2e971046e7493541",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f61bab",
                 "code" : "",
@@ -202,10 +209,220 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g1v0_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d2g1v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x021bab",
+                    "hash" : "0x3ccbbcb3fea5e8d14f29588750e29c4db2dd5f0727db4eafb252778d7aa07482",
+                    "mixHash" : "0xca1b9e3ba62194d7445cfc37a0142e17444f4acac944a907c9e4e412585d7b9f",
+                    "nonce" : "0xb48c6fae047f6bcc",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0x53676617105e409ad2fa2ca6c10cff34c7e103bb501f2af60fd65b5311754d2c",
+                    "stateRoot" : "0x8964f2826c5f39086e6c7bde2870c0c9ceb501008c4794d50dcea2e485ec7013",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x496f19ec0509dacf7dbe406c36d51bddf9598e567abf443c2a4a25bf157530eb",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08964f2826c5f39086e6c7bde2870c0c9ceb501008c4794d50dcea2e485ec7013a0496f19ec0509dacf7dbe406c36d51bddf9598e567abf443c2a4a25bf157530eba053676617105e409ad2fa2ca6c10cff34c7e103bb501f2af60fd65b5311754d2cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a0ca1b9e3ba62194d7445cfc37a0142e17444f4acac944a907c9e4e412585d7b9f88b48c6fae047f6bccf882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca08b635b43f942c8ac5d3f8b0e87e998f946ad7b93a211e4ebfd251ea720075a6ba02c5d4e6d0b24fa9978582c5cc49b744e95293e082352c7949efb3763fa57baeac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
+                        "gasLimit" : "0x0222e0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8b635b43f942c8ac5d3f8b0e87e998f946ad7b93a211e4ebfd251ea720075a6b",
+                        "s" : "0x2c5d4e6d0b24fa9978582c5cc49b744e95293e082352c7949efb3763fa57baea",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3ccbbcb3fea5e8d14f29588750e29c4db2dd5f0727db4eafb252778d7aa07482",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f61bab",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2f455",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d2g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g1v0Filler.json"
         },
         "blocks" : [
@@ -217,9 +434,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x021bab",
-                    "hash" : "0x97824885d987e17c73ac50a19179dab262ed2ebc848b49f4272a2d78b8a28ea6",
-                    "mixHash" : "0x9aad5550aa2d9ccaabb87cc50199a3660898d1ec5b12fee9c22e95faefe9a2fa",
-                    "nonce" : "0x4870f5699f1088a3",
+                    "hash" : "0xd722d97f91556db19769315bd5b9dab82fcb03703bbff88f4d846b3bc841eaa4",
+                    "mixHash" : "0xe3cf06995d68093bf74723be60ed29540a097864910ef94dde6b9ecf6a4cab77",
+                    "nonce" : "0x720aee9e2bc1a7b7",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248",
@@ -228,7 +445,7 @@
                     "transactionsTrie" : "0x496f19ec0509dacf7dbe406c36d51bddf9598e567abf443c2a4a25bf157530eb",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a27bd406ba7bfcfa53658aeb61745209354cfd1bf2e7b109f3d0e505239cf53da0496f19ec0509dacf7dbe406c36d51bddf9598e567abf443c2a4a25bf157530eba0974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a09aad5550aa2d9ccaabb87cc50199a3660898d1ec5b12fee9c22e95faefe9a2fa884870f5699f1088a3f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca08b635b43f942c8ac5d3f8b0e87e998f946ad7b93a211e4ebfd251ea720075a6ba02c5d4e6d0b24fa9978582c5cc49b744e95293e082352c7949efb3763fa57baeac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a27bd406ba7bfcfa53658aeb61745209354cfd1bf2e7b109f3d0e505239cf53da0496f19ec0509dacf7dbe406c36d51bddf9598e567abf443c2a4a25bf157530eba0974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a0e3cf06995d68093bf74723be60ed29540a097864910ef94dde6b9ecf6a4cab7788720aee9e2bc1a7b7f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca08b635b43f942c8ac5d3f8b0e87e998f946ad7b93a211e4ebfd251ea720075a6ba02c5d4e6d0b24fa9978582c5cc49b744e95293e082352c7949efb3763fa57baeac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -265,8 +482,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x97824885d987e17c73ac50a19179dab262ed2ebc848b49f4272a2d78b8a28ea6",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd722d97f91556db19769315bd5b9dab82fcb03703bbff88f4d846b3bc841eaa4",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f61bab",
@@ -405,10 +622,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g1v0_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d2g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g1v0Filler.json"
         },
         "blocks" : [
@@ -419,19 +636,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0222e0",
-                    "hash" : "0xcc4088f538b69c78a74953914a075bc63c631f1105a16bf7f4dc14fa8d843bcb",
-                    "mixHash" : "0x6f1ce6faf939b63fadc63250cb06b8b8675d0cf64361e45e7c91dfea74a21375",
-                    "nonce" : "0xdf2b8e537c952276",
+                    "gasUsed" : "0x021bab",
+                    "hash" : "0xeffe0b04368dd4e4aad5eb42e19ebd545e407fc7a191d7ef5e4fe84d401ab836",
+                    "mixHash" : "0x59eb90e12690f570aaf63b361b5c1a74840e2731fb7affd3fd06c20037015ca1",
+                    "nonce" : "0xbaaf7186904cb880",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x4127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705",
-                    "stateRoot" : "0x4a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474c",
+                    "receiptTrie" : "0x974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248",
+                    "stateRoot" : "0xa27bd406ba7bfcfa53658aeb61745209354cfd1bf2e7b109f3d0e505239cf53d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x496f19ec0509dacf7dbe406c36d51bddf9598e567abf443c2a4a25bf157530eb",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca0496f19ec0509dacf7dbe406c36d51bddf9598e567abf443c2a4a25bf157530eba04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a06f1ce6faf939b63fadc63250cb06b8b8675d0cf64361e45e7c91dfea74a2137588df2b8e537c952276f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca08b635b43f942c8ac5d3f8b0e87e998f946ad7b93a211e4ebfd251ea720075a6ba02c5d4e6d0b24fa9978582c5cc49b744e95293e082352c7949efb3763fa57baeac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a27bd406ba7bfcfa53658aeb61745209354cfd1bf2e7b109f3d0e505239cf53da0496f19ec0509dacf7dbe406c36d51bddf9598e567abf443c2a4a25bf157530eba0974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a059eb90e12690f570aaf63b361b5c1a74840e2731fb7affd3fd06c20037015ca188baaf7186904cb880f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca08b635b43f942c8ac5d3f8b0e87e998f946ad7b93a211e4ebfd251ea720075a6ba02c5d4e6d0b24fa9978582c5cc49b744e95293e082352c7949efb3763fa57baeac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -468,11 +685,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcc4088f538b69c78a74953914a075bc63c631f1105a16bf7f4dc14fa8d843bcb",
-        "network" : "Frontier",
+        "lastblockhash" : "0xeffe0b04368dd4e4aad5eb42e19ebd545e407fc7a191d7ef5e4fe84d401ab836",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f622e0",
+                "balance" : "0x4563918244f61bab",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,7 +724,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2ed20",
+                "balance" : "0xe8d4a2f455",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -608,10 +825,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g1v0_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d2g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g1v0Filler.json"
         },
         "blocks" : [
@@ -623,9 +840,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0222e0",
-                    "hash" : "0xeecf839de8dda4ee1004cd4ff1a513d431d5e0625653339aeabbb0537fb95c3c",
-                    "mixHash" : "0x1de5b91ccbe1ec8b8c9b6726b06d63e4160bae36887febefc4754cc69405d10a",
-                    "nonce" : "0x6e34fa0a9e391a9d",
+                    "hash" : "0x348907cdb1134d377f33897fec80220f5cf85c338e7dff8acc34a2fbac030cb1",
+                    "mixHash" : "0xfc709c9c5ba2734fb74262ccde51bd102cb40082b90d84a541c48d1cf50ef819",
+                    "nonce" : "0xb0214b9da1720341",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x4127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705",
@@ -634,7 +851,7 @@
                     "transactionsTrie" : "0x496f19ec0509dacf7dbe406c36d51bddf9598e567abf443c2a4a25bf157530eb",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca0496f19ec0509dacf7dbe406c36d51bddf9598e567abf443c2a4a25bf157530eba04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a01de5b91ccbe1ec8b8c9b6726b06d63e4160bae36887febefc4754cc69405d10a886e34fa0a9e391a9df882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca08b635b43f942c8ac5d3f8b0e87e998f946ad7b93a211e4ebfd251ea720075a6ba02c5d4e6d0b24fa9978582c5cc49b744e95293e082352c7949efb3763fa57baeac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca0496f19ec0509dacf7dbe406c36d51bddf9598e567abf443c2a4a25bf157530eba04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a0fc709c9c5ba2734fb74262ccde51bd102cb40082b90d84a541c48d1cf50ef81988b0214b9da1720341f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca08b635b43f942c8ac5d3f8b0e87e998f946ad7b93a211e4ebfd251ea720075a6ba02c5d4e6d0b24fa9978582c5cc49b744e95293e082352c7949efb3763fa57baeac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -671,8 +888,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeecf839de8dda4ee1004cd4ff1a513d431d5e0625653339aeabbb0537fb95c3c",
-        "network" : "Homestead",
+        "lastblockhash" : "0x348907cdb1134d377f33897fec80220f5cf85c338e7dff8acc34a2fbac030cb1",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f622e0",
@@ -811,10 +1028,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g1v0_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d2g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g1v0Filler.json"
         },
         "blocks" : [
@@ -825,19 +1042,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x021bab",
-                    "hash" : "0x51db943781096672b37825c6b0288b33fd01814bfaebe07f517ba2b2c29e62fc",
-                    "mixHash" : "0xb6bf52d8e2fd385c6bcee40e947c954c18d6d9b4b16e412a83927ebc62460f9f",
-                    "nonce" : "0x884c2df4d90130bd",
+                    "gasUsed" : "0x0222e0",
+                    "hash" : "0xaa94f249dfa8c0856c02b36fb275ef2701f1a187289656b4ac40fdeb332a9817",
+                    "mixHash" : "0xdca0460a99bdf19bfd6186ba2bbd87493202bfc28167e4c3e23a6c2a6eb558ad",
+                    "nonce" : "0xfd71042b1ed92785",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x53676617105e409ad2fa2ca6c10cff34c7e103bb501f2af60fd65b5311754d2c",
-                    "stateRoot" : "0x8964f2826c5f39086e6c7bde2870c0c9ceb501008c4794d50dcea2e485ec7013",
+                    "receiptTrie" : "0x4127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705",
+                    "stateRoot" : "0x4a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x496f19ec0509dacf7dbe406c36d51bddf9598e567abf443c2a4a25bf157530eb",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08964f2826c5f39086e6c7bde2870c0c9ceb501008c4794d50dcea2e485ec7013a0496f19ec0509dacf7dbe406c36d51bddf9598e567abf443c2a4a25bf157530eba053676617105e409ad2fa2ca6c10cff34c7e103bb501f2af60fd65b5311754d2cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a0b6bf52d8e2fd385c6bcee40e947c954c18d6d9b4b16e412a83927ebc62460f9f88884c2df4d90130bdf882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca08b635b43f942c8ac5d3f8b0e87e998f946ad7b93a211e4ebfd251ea720075a6ba02c5d4e6d0b24fa9978582c5cc49b744e95293e082352c7949efb3763fa57baeac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca0496f19ec0509dacf7dbe406c36d51bddf9598e567abf443c2a4a25bf157530eba04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a0dca0460a99bdf19bfd6186ba2bbd87493202bfc28167e4c3e23a6c2a6eb558ad88fd71042b1ed92785f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca08b635b43f942c8ac5d3f8b0e87e998f946ad7b93a211e4ebfd251ea720075a6ba02c5d4e6d0b24fa9978582c5cc49b744e95293e082352c7949efb3763fa57baeac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -874,18 +1091,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x51db943781096672b37825c6b0288b33fd01814bfaebe07f517ba2b2c29e62fc",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xaa94f249dfa8c0856c02b36fb275ef2701f1a187289656b4ac40fdeb332a9817",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f61bab",
+                "balance" : "0x4563918244f622e0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -920,7 +1130,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2f455",
+                "balance" : "0xe8d4a2ed20",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g1v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g1v1.json
index 7620f6b12..72103f5e0 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g1v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g1v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d2g1v1_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d2g1v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g1v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x021c38",
-                    "hash" : "0x5a83abe9617722eb986f2c30c3fa0dd3ce81565e66cefbabd633bd3f62b473ec",
-                    "mixHash" : "0x19f7506a4228db043bceb2b4dfc35e472c440554a7400f59ea74d4629624c25e",
-                    "nonce" : "0x154a715551652a99",
+                    "hash" : "0x695253132c858f07d740b470e3886f087e358e8a0883fd0149307ee914fd706a",
+                    "mixHash" : "0x928347592d6b6e70330ba79398173b23a8e7cdc4e0c61acc34a3077bf6dfb7ea",
+                    "nonce" : "0x02bbb35f8dbc4baa",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x4569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347",
-                    "stateRoot" : "0x3c1d230a551485cf88053ae87b45605c9aef43f470d13df126fe6ae8beb5fcb0",
+                    "receiptTrie" : "0x24d2d186ab09293dbc34b96a81c4c5b17ca8ffcaf089fac761837eb4295292ce",
+                    "stateRoot" : "0xce4e66c72c075a0f93843f269406dbe35dcdcc3f047d9739dc77ad2e3500bbfe",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd502cb8e1005fe0b3469e4dd86608318bf7061fa69c736a8c62adb4aa7f73454",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c1d230a551485cf88053ae87b45605c9aef43f470d13df126fe6ae8beb5fcb0a0d502cb8e1005fe0b3469e4dd86608318bf7061fa69c736a8c62adb4aa7f73454a04569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a019f7506a4228db043bceb2b4dfc35e472c440554a7400f59ea74d4629624c25e88154a715551652a99f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba088dfe64177a097b3c52b954da06cd3cf72debd2321e681b9882bae303f2fa894a07f5cea5919d7e4428a168853cd998b2a55ec504a9341801d17d570416dcf2dcbc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ce4e66c72c075a0f93843f269406dbe35dcdcc3f047d9739dc77ad2e3500bbfea0d502cb8e1005fe0b3469e4dd86608318bf7061fa69c736a8c62adb4aa7f73454a024d2d186ab09293dbc34b96a81c4c5b17ca8ffcaf089fac761837eb4295292ceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a0928347592d6b6e70330ba79398173b23a8e7cdc4e0c61acc34a3077bf6dfb7ea8802bbb35f8dbc4baaf882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba088dfe64177a097b3c52b954da06cd3cf72debd2321e681b9882bae303f2fa894a07f5cea5919d7e4428a168853cd998b2a55ec504a9341801d17d570416dcf2dcbc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5a83abe9617722eb986f2c30c3fa0dd3ce81565e66cefbabd633bd3f62b473ec",
-        "network" : "EIP150",
+        "lastblockhash" : "0x695253132c858f07d740b470e3886f087e358e8a0883fd0149307ee914fd706a",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f61c38",
                 "code" : "",
@@ -202,10 +209,220 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g1v1_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d2g1v1_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g1v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x021c38",
+                    "hash" : "0x4f88a6368e0f12b63e286700e88b12141638a94484068c285a49deb6ad824729",
+                    "mixHash" : "0x859581fc79a4379ac3d93d58a176d20d95c23733c069aa964148cec61eccd5c0",
+                    "nonce" : "0xa6034a4aa9634f1f",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0x24d2d186ab09293dbc34b96a81c4c5b17ca8ffcaf089fac761837eb4295292ce",
+                    "stateRoot" : "0xce4e66c72c075a0f93843f269406dbe35dcdcc3f047d9739dc77ad2e3500bbfe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd502cb8e1005fe0b3469e4dd86608318bf7061fa69c736a8c62adb4aa7f73454",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ce4e66c72c075a0f93843f269406dbe35dcdcc3f047d9739dc77ad2e3500bbfea0d502cb8e1005fe0b3469e4dd86608318bf7061fa69c736a8c62adb4aa7f73454a024d2d186ab09293dbc34b96a81c4c5b17ca8ffcaf089fac761837eb4295292ceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a0859581fc79a4379ac3d93d58a176d20d95c23733c069aa964148cec61eccd5c088a6034a4aa9634f1ff882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba088dfe64177a097b3c52b954da06cd3cf72debd2321e681b9882bae303f2fa894a07f5cea5919d7e4428a168853cd998b2a55ec504a9341801d17d570416dcf2dcbc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
+                        "gasLimit" : "0x0222e0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x88dfe64177a097b3c52b954da06cd3cf72debd2321e681b9882bae303f2fa894",
+                        "s" : "0x7f5cea5919d7e4428a168853cd998b2a55ec504a9341801d17d570416dcf2dcb",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4f88a6368e0f12b63e286700e88b12141638a94484068c285a49deb6ad824729",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f61c38",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2f3be",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x0a",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d2g1v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g1v1Filler.json"
         },
         "blocks" : [
@@ -217,9 +434,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x021c38",
-                    "hash" : "0xede5961298dda4fd98c4b0687bb7c95be3226c03240e03d81af4b62aad7047e3",
-                    "mixHash" : "0x4e1d10e92bc148b790e4efbcd42f94599cce6bc844bc58be712737dcc73ed34b",
-                    "nonce" : "0x435c394f5fa22a17",
+                    "hash" : "0x5e26f76cc017ca3bb54e0d3bd5719f473a2f0589b38dbb611b1d186438c87bed",
+                    "mixHash" : "0x99c33dcade935e8505961087b34fb33fc0b71e25a9e760f4ad4dffe3e733017d",
+                    "nonce" : "0x817bda8443a67814",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x4569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347",
@@ -228,7 +445,7 @@
                     "transactionsTrie" : "0xd502cb8e1005fe0b3469e4dd86608318bf7061fa69c736a8c62adb4aa7f73454",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c1d230a551485cf88053ae87b45605c9aef43f470d13df126fe6ae8beb5fcb0a0d502cb8e1005fe0b3469e4dd86608318bf7061fa69c736a8c62adb4aa7f73454a04569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a04e1d10e92bc148b790e4efbcd42f94599cce6bc844bc58be712737dcc73ed34b88435c394f5fa22a17f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba088dfe64177a097b3c52b954da06cd3cf72debd2321e681b9882bae303f2fa894a07f5cea5919d7e4428a168853cd998b2a55ec504a9341801d17d570416dcf2dcbc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c1d230a551485cf88053ae87b45605c9aef43f470d13df126fe6ae8beb5fcb0a0d502cb8e1005fe0b3469e4dd86608318bf7061fa69c736a8c62adb4aa7f73454a04569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a099c33dcade935e8505961087b34fb33fc0b71e25a9e760f4ad4dffe3e733017d88817bda8443a67814f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba088dfe64177a097b3c52b954da06cd3cf72debd2321e681b9882bae303f2fa894a07f5cea5919d7e4428a168853cd998b2a55ec504a9341801d17d570416dcf2dcbc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -265,8 +482,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xede5961298dda4fd98c4b0687bb7c95be3226c03240e03d81af4b62aad7047e3",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5e26f76cc017ca3bb54e0d3bd5719f473a2f0589b38dbb611b1d186438c87bed",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f61c38",
@@ -405,10 +622,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g1v1_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d2g1v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g1v1Filler.json"
         },
         "blocks" : [
@@ -419,19 +636,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0222e0",
-                    "hash" : "0x5398b4031ee93e5d281ecfd1e49af218ba8ece60a1215b48fbe2705e41c8f781",
-                    "mixHash" : "0xd6e9c6e168f9985e932865db50b2d5327c1fd8a814c9bcc8fe8cbcb9c5a609e8",
-                    "nonce" : "0x2afffeb7600c7fe7",
+                    "gasUsed" : "0x021c38",
+                    "hash" : "0xb4ee53d37aace32d64f70398a92b5a600e06997282a582feafe637d87424b5df",
+                    "mixHash" : "0x2d74f49dd3300afa1bd776efa138e7fff058857d0cfab3985f15120d2fbcdf99",
+                    "nonce" : "0x845140e2a29ba476",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x4127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705",
-                    "stateRoot" : "0x4a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474c",
+                    "receiptTrie" : "0x4569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347",
+                    "stateRoot" : "0x3c1d230a551485cf88053ae87b45605c9aef43f470d13df126fe6ae8beb5fcb0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd502cb8e1005fe0b3469e4dd86608318bf7061fa69c736a8c62adb4aa7f73454",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca0d502cb8e1005fe0b3469e4dd86608318bf7061fa69c736a8c62adb4aa7f73454a04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a0d6e9c6e168f9985e932865db50b2d5327c1fd8a814c9bcc8fe8cbcb9c5a609e8882afffeb7600c7fe7f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba088dfe64177a097b3c52b954da06cd3cf72debd2321e681b9882bae303f2fa894a07f5cea5919d7e4428a168853cd998b2a55ec504a9341801d17d570416dcf2dcbc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c1d230a551485cf88053ae87b45605c9aef43f470d13df126fe6ae8beb5fcb0a0d502cb8e1005fe0b3469e4dd86608318bf7061fa69c736a8c62adb4aa7f73454a04569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a02d74f49dd3300afa1bd776efa138e7fff058857d0cfab3985f15120d2fbcdf9988845140e2a29ba476f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba088dfe64177a097b3c52b954da06cd3cf72debd2321e681b9882bae303f2fa894a07f5cea5919d7e4428a168853cd998b2a55ec504a9341801d17d570416dcf2dcbc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -468,11 +685,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5398b4031ee93e5d281ecfd1e49af218ba8ece60a1215b48fbe2705e41c8f781",
-        "network" : "Frontier",
+        "lastblockhash" : "0xb4ee53d37aace32d64f70398a92b5a600e06997282a582feafe637d87424b5df",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f622e0",
+                "balance" : "0x4563918244f61c38",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,14 +724,14 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2ed20",
+                "balance" : "0xe8d4a2f3be",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
-                "balance" : "0x00",
+                "balance" : "0x0a",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
@@ -608,10 +825,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g1v1_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d2g1v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g1v1Filler.json"
         },
         "blocks" : [
@@ -623,9 +840,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0222e0",
-                    "hash" : "0xa6865ae1e81c82ec22b7d49199669241b87374c3148fd59ff9d821887d990fae",
-                    "mixHash" : "0xcfaeea5510f87d52f2d07bee91654d313b45a84946084c734270d68df411175e",
-                    "nonce" : "0x6449861a80877b8f",
+                    "hash" : "0x302f813e095d4c76f2d5bdbbc7b2ca873c7cb1507f59867ae04b0fa9e7a2d898",
+                    "mixHash" : "0x77902173ad2b9f09261c7598c684f92f4bb93bfab64c1a81e803d4ffb9ad8114",
+                    "nonce" : "0x666c74f09928ba8d",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x4127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705",
@@ -634,7 +851,7 @@
                     "transactionsTrie" : "0xd502cb8e1005fe0b3469e4dd86608318bf7061fa69c736a8c62adb4aa7f73454",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca0d502cb8e1005fe0b3469e4dd86608318bf7061fa69c736a8c62adb4aa7f73454a04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a0cfaeea5510f87d52f2d07bee91654d313b45a84946084c734270d68df411175e886449861a80877b8ff882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba088dfe64177a097b3c52b954da06cd3cf72debd2321e681b9882bae303f2fa894a07f5cea5919d7e4428a168853cd998b2a55ec504a9341801d17d570416dcf2dcbc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca0d502cb8e1005fe0b3469e4dd86608318bf7061fa69c736a8c62adb4aa7f73454a04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a077902173ad2b9f09261c7598c684f92f4bb93bfab64c1a81e803d4ffb9ad811488666c74f09928ba8df882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba088dfe64177a097b3c52b954da06cd3cf72debd2321e681b9882bae303f2fa894a07f5cea5919d7e4428a168853cd998b2a55ec504a9341801d17d570416dcf2dcbc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -671,8 +888,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa6865ae1e81c82ec22b7d49199669241b87374c3148fd59ff9d821887d990fae",
-        "network" : "Homestead",
+        "lastblockhash" : "0x302f813e095d4c76f2d5bdbbc7b2ca873c7cb1507f59867ae04b0fa9e7a2d898",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f622e0",
@@ -811,10 +1028,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g1v1_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d2g1v1_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g1v1Filler.json"
         },
         "blocks" : [
@@ -825,19 +1042,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x021c38",
-                    "hash" : "0x681920a4a051e27a853d63f29bf1bbd98bf250c69832eb652c9cf359a8ea7cc3",
-                    "mixHash" : "0x3e60a3cac2994f7f2fa62241aa7ec7781f06196f3edf2933f5f68548880fe7b1",
-                    "nonce" : "0xb5a0997c0f5c4c35",
+                    "gasUsed" : "0x0222e0",
+                    "hash" : "0x50b7673f7b207e8005cb9ec9b9d5cba009b57c61bd92ec7cac91615f3821ac7c",
+                    "mixHash" : "0x799a570c1e881a25f942f135eadb871796ea2413d20d9111768c9513548698b5",
+                    "nonce" : "0x9513d15225790607",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x24d2d186ab09293dbc34b96a81c4c5b17ca8ffcaf089fac761837eb4295292ce",
-                    "stateRoot" : "0xce4e66c72c075a0f93843f269406dbe35dcdcc3f047d9739dc77ad2e3500bbfe",
+                    "receiptTrie" : "0x4127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705",
+                    "stateRoot" : "0x4a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd502cb8e1005fe0b3469e4dd86608318bf7061fa69c736a8c62adb4aa7f73454",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ce4e66c72c075a0f93843f269406dbe35dcdcc3f047d9739dc77ad2e3500bbfea0d502cb8e1005fe0b3469e4dd86608318bf7061fa69c736a8c62adb4aa7f73454a024d2d186ab09293dbc34b96a81c4c5b17ca8ffcaf089fac761837eb4295292ceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a03e60a3cac2994f7f2fa62241aa7ec7781f06196f3edf2933f5f68548880fe7b188b5a0997c0f5c4c35f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba088dfe64177a097b3c52b954da06cd3cf72debd2321e681b9882bae303f2fa894a07f5cea5919d7e4428a168853cd998b2a55ec504a9341801d17d570416dcf2dcbc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca0d502cb8e1005fe0b3469e4dd86608318bf7061fa69c736a8c62adb4aa7f73454a04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a0799a570c1e881a25f942f135eadb871796ea2413d20d9111768c9513548698b5889513d15225790607f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba088dfe64177a097b3c52b954da06cd3cf72debd2321e681b9882bae303f2fa894a07f5cea5919d7e4428a168853cd998b2a55ec504a9341801d17d570416dcf2dcbc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -874,18 +1091,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x681920a4a051e27a853d63f29bf1bbd98bf250c69832eb652c9cf359a8ea7cc3",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x50b7673f7b207e8005cb9ec9b9d5cba009b57c61bd92ec7cac91615f3821ac7c",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f61c38",
+                "balance" : "0x4563918244f622e0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -920,14 +1130,14 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2f3be",
+                "balance" : "0xe8d4a2ed20",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
-                "balance" : "0x0a",
+                "balance" : "0x00",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g2v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g2v0.json
index 1aa0e2abd..d330e45a5 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g2v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d2g2v0_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d2g2v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g2v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x026893",
-                    "hash" : "0x4bf5b33b1048c6fd76cd3baae9c6695baee651bab5ef7f24bd29c3cd333a037f",
-                    "mixHash" : "0xade7c261b4bd8be58db2ccf893e12d8405b179be7c555bc40a7ad31cbc2c6696",
-                    "nonce" : "0x40b15977bcbc37a2",
+                    "gasUsed" : "0x021f7f",
+                    "hash" : "0x03286dd817d7c774b5a57fed104c7b315e7828e668a569e8170bfc7013b8deb8",
+                    "mixHash" : "0x571a97d3d726722b32fd3bc0f3551ecfed87553b585ac5e477536d823e2aa5c1",
+                    "nonce" : "0x414e176a2ac84fcb",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xfaa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bc",
-                    "stateRoot" : "0x1c7205499c9374238b01f9165469bffa499f1e737f29ea24b7db2a6602e0618b",
+                    "receiptTrie" : "0x75d2ca6c8aabd76d8466ea40c1eb93bd88e11ff8b909f569a499399104367fb1",
+                    "stateRoot" : "0x4204bb99846e824ee99d79eb18cebf2957f25a278ae1fd78f120d58ff5994f93",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc6fcce87b155ced48f6e1838395379b62f402e24efd6d52f1a9d7467c772c0a6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c7205499c9374238b01f9165469bffa499f1e737f29ea24b7db2a6602e0618ba0c6fcce87b155ced48f6e1838395379b62f402e24efd6d52f1a9d7467c772c0a6a0faa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bcb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830268938203e880a0ade7c261b4bd8be58db2ccf893e12d8405b179be7c555bc40a7ad31cbc2c66968840b15977bcbc37a2f882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca091481ae028622c3978e865c8429c310dd6b3ec68f47708f935e8ea6c110de199a0384f50dc1f42bc7c3570212b940b6663d328104f2fcc936ae8871102b4073f0fc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04204bb99846e824ee99d79eb18cebf2957f25a278ae1fd78f120d58ff5994f93a0c6fcce87b155ced48f6e1838395379b62f402e24efd6d52f1a9d7467c772c0a6a075d2ca6c8aabd76d8466ea40c1eb93bd88e11ff8b909f569a499399104367fb1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021f7f8203e880a0571a97d3d726722b32fd3bc0f3551ecfed87553b585ac5e477536d823e2aa5c188414e176a2ac84fcbf882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca091481ae028622c3978e865c8429c310dd6b3ec68f47708f935e8ea6c110de199a0384f50dc1f42bc7c3570212b940b6663d328104f2fcc936ae8871102b4073f0fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4bf5b33b1048c6fd76cd3baae9c6695baee651bab5ef7f24bd29c3cd333a037f",
-        "network" : "EIP150",
+        "lastblockhash" : "0x03286dd817d7c774b5a57fed104c7b315e7828e668a569e8170bfc7013b8deb8",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f66893",
+                "balance" : "0x4563918244f61f7f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -91,6 +98,8 @@
                 "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c"
                 }
             },
             "0xa300000000000000000000000000000000000000" : {
@@ -101,7 +110,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2a76d",
+                "balance" : "0xe8d4a2f081",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -202,10 +211,222 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g2v0_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d2g2v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g2v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x021f7f",
+                    "hash" : "0xdcab2a1e75cb8af5c613bf508f85b5f03e4eead8562bdf67aae0a00b5988c40d",
+                    "mixHash" : "0xef986c067dd288c6894322094c7d705c83cde45bd32d99b28c110928103f70fd",
+                    "nonce" : "0x8176eb7ababfcd92",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0x75d2ca6c8aabd76d8466ea40c1eb93bd88e11ff8b909f569a499399104367fb1",
+                    "stateRoot" : "0x4204bb99846e824ee99d79eb18cebf2957f25a278ae1fd78f120d58ff5994f93",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc6fcce87b155ced48f6e1838395379b62f402e24efd6d52f1a9d7467c772c0a6",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04204bb99846e824ee99d79eb18cebf2957f25a278ae1fd78f120d58ff5994f93a0c6fcce87b155ced48f6e1838395379b62f402e24efd6d52f1a9d7467c772c0a6a075d2ca6c8aabd76d8466ea40c1eb93bd88e11ff8b909f569a499399104367fb1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021f7f8203e880a0ef986c067dd288c6894322094c7d705c83cde45bd32d99b28c110928103f70fd888176eb7ababfcd92f882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca091481ae028622c3978e865c8429c310dd6b3ec68f47708f935e8ea6c110de199a0384f50dc1f42bc7c3570212b940b6663d328104f2fcc936ae8871102b4073f0fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
+                        "gasLimit" : "0x027100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x91481ae028622c3978e865c8429c310dd6b3ec68f47708f935e8ea6c110de199",
+                        "s" : "0x384f50dc1f42bc7c3570212b940b6663d328104f2fcc936ae8871102b4073f0f",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdcab2a1e75cb8af5c613bf508f85b5f03e4eead8562bdf67aae0a00b5988c40d",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f61f7f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c"
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2f081",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d2g2v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g2v0Filler.json"
         },
         "blocks" : [
@@ -217,9 +438,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x026893",
-                    "hash" : "0x9a49068fb936267d6ef4addf622079cac8430468de4de6f333d968b996ed2576",
-                    "mixHash" : "0x2af582ca8d273749697209fcabed414b18420b12842d9cea1ad9e82785759804",
-                    "nonce" : "0x4e6dc6116d0a74bc",
+                    "hash" : "0x9619060e758d4d6a9a0e4d9273d8a51977aecc4651d8f880a69a9220921ac1a6",
+                    "mixHash" : "0x58318488b14ceecb43e1ed1d5b04429c254f76eb434b5f08bc91752b4c923c64",
+                    "nonce" : "0xb4132a62894e56ae",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xfaa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bc",
@@ -228,7 +449,7 @@
                     "transactionsTrie" : "0xc6fcce87b155ced48f6e1838395379b62f402e24efd6d52f1a9d7467c772c0a6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c7205499c9374238b01f9165469bffa499f1e737f29ea24b7db2a6602e0618ba0c6fcce87b155ced48f6e1838395379b62f402e24efd6d52f1a9d7467c772c0a6a0faa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bcb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830268938203e880a02af582ca8d273749697209fcabed414b18420b12842d9cea1ad9e82785759804884e6dc6116d0a74bcf882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca091481ae028622c3978e865c8429c310dd6b3ec68f47708f935e8ea6c110de199a0384f50dc1f42bc7c3570212b940b6663d328104f2fcc936ae8871102b4073f0fc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c7205499c9374238b01f9165469bffa499f1e737f29ea24b7db2a6602e0618ba0c6fcce87b155ced48f6e1838395379b62f402e24efd6d52f1a9d7467c772c0a6a0faa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bcb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830268938203e880a058318488b14ceecb43e1ed1d5b04429c254f76eb434b5f08bc91752b4c923c6488b4132a62894e56aef882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca091481ae028622c3978e865c8429c310dd6b3ec68f47708f935e8ea6c110de199a0384f50dc1f42bc7c3570212b940b6663d328104f2fcc936ae8871102b4073f0fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -265,8 +486,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9a49068fb936267d6ef4addf622079cac8430468de4de6f333d968b996ed2576",
-        "network" : "EIP158",
+        "lastblockhash" : "0x9619060e758d4d6a9a0e4d9273d8a51977aecc4651d8f880a69a9220921ac1a6",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f66893",
@@ -405,10 +626,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g2v0_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d2g2v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g2v0Filler.json"
         },
         "blocks" : [
@@ -419,19 +640,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x027100",
-                    "hash" : "0xdd66a2f1b0bd62df36a77d5f3402f303977679ba78410f0e855796e2cc876c33",
-                    "mixHash" : "0xff40b2b38abba3d0b5927aebcd638821d4844e3b26dfbf7c5bf8b8c07f4b4555",
-                    "nonce" : "0xee9a513159a62788",
+                    "gasUsed" : "0x026893",
+                    "hash" : "0xb5605039a4eb0cc84036d6a912999979edf211e271ab5e4186c185dad990986c",
+                    "mixHash" : "0x13a5df5b62db05100fc0b608876fbaebd982dc204f86e388c203997ab2a6f09c",
+                    "nonce" : "0xfd29d821a60e213d",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
-                    "stateRoot" : "0x73f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26e",
+                    "receiptTrie" : "0xfaa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bc",
+                    "stateRoot" : "0x1c7205499c9374238b01f9165469bffa499f1e737f29ea24b7db2a6602e0618b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc6fcce87b155ced48f6e1838395379b62f402e24efd6d52f1a9d7467c772c0a6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea0c6fcce87b155ced48f6e1838395379b62f402e24efd6d52f1a9d7467c772c0a6a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0ff40b2b38abba3d0b5927aebcd638821d4844e3b26dfbf7c5bf8b8c07f4b455588ee9a513159a62788f882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca091481ae028622c3978e865c8429c310dd6b3ec68f47708f935e8ea6c110de199a0384f50dc1f42bc7c3570212b940b6663d328104f2fcc936ae8871102b4073f0fc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c7205499c9374238b01f9165469bffa499f1e737f29ea24b7db2a6602e0618ba0c6fcce87b155ced48f6e1838395379b62f402e24efd6d52f1a9d7467c772c0a6a0faa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bcb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830268938203e880a013a5df5b62db05100fc0b608876fbaebd982dc204f86e388c203997ab2a6f09c88fd29d821a60e213df882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca091481ae028622c3978e865c8429c310dd6b3ec68f47708f935e8ea6c110de199a0384f50dc1f42bc7c3570212b940b6663d328104f2fcc936ae8871102b4073f0fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -468,11 +689,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdd66a2f1b0bd62df36a77d5f3402f303977679ba78410f0e855796e2cc876c33",
-        "network" : "Frontier",
+        "lastblockhash" : "0xb5605039a4eb0cc84036d6a912999979edf211e271ab5e4186c185dad990986c",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f67100",
+                "balance" : "0x4563918244f66893",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,7 +728,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a29f00",
+                "balance" : "0xe8d4a2a76d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -608,10 +829,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g2v0_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d2g2v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g2v0Filler.json"
         },
         "blocks" : [
@@ -623,9 +844,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0x525fe5d600ec0d1051eb9f31736521f5cb9570ea8414b797823dfd08e17a85f8",
-                    "mixHash" : "0xe9b9de5bc94cf90e04742171f6b699406ff0e794707f0f852262e25d83b6551f",
-                    "nonce" : "0x5b7afac83bff4f32",
+                    "hash" : "0x01f191ce1138e5db7c38434bbb207c15b90710096ddd597a75daa906bd694bf7",
+                    "mixHash" : "0x4567086e8c4cacdf04a4db8cde1e5030e13aa99c1bfdf4f6c9961ee2718429ce",
+                    "nonce" : "0xbe7ecc012635e9a8",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
@@ -634,7 +855,7 @@
                     "transactionsTrie" : "0xc6fcce87b155ced48f6e1838395379b62f402e24efd6d52f1a9d7467c772c0a6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea0c6fcce87b155ced48f6e1838395379b62f402e24efd6d52f1a9d7467c772c0a6a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0e9b9de5bc94cf90e04742171f6b699406ff0e794707f0f852262e25d83b6551f885b7afac83bff4f32f882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca091481ae028622c3978e865c8429c310dd6b3ec68f47708f935e8ea6c110de199a0384f50dc1f42bc7c3570212b940b6663d328104f2fcc936ae8871102b4073f0fc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea0c6fcce87b155ced48f6e1838395379b62f402e24efd6d52f1a9d7467c772c0a6a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a04567086e8c4cacdf04a4db8cde1e5030e13aa99c1bfdf4f6c9961ee2718429ce88be7ecc012635e9a8f882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca091481ae028622c3978e865c8429c310dd6b3ec68f47708f935e8ea6c110de199a0384f50dc1f42bc7c3570212b940b6663d328104f2fcc936ae8871102b4073f0fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -671,8 +892,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x525fe5d600ec0d1051eb9f31736521f5cb9570ea8414b797823dfd08e17a85f8",
-        "network" : "Homestead",
+        "lastblockhash" : "0x01f191ce1138e5db7c38434bbb207c15b90710096ddd597a75daa906bd694bf7",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f67100",
@@ -811,10 +1032,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g2v0_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d2g2v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g2v0Filler.json"
         },
         "blocks" : [
@@ -825,19 +1046,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x021f7f",
-                    "hash" : "0xf90f97438bfe940651c3cc0033819592b94c750d1dd4411ed4389df1861d8199",
-                    "mixHash" : "0x998a812b614f9d30b6891278ba69c91dd4c9ec39fb56a73767e984cc8c9a35a6",
-                    "nonce" : "0x1dd15e98025d434c",
+                    "gasUsed" : "0x027100",
+                    "hash" : "0x89056a33a41f8bf73733ba2f0512573a82035290697b58976f7e0e20f96d71e5",
+                    "mixHash" : "0x71f7d953541af524ec1b38e09c5a18b4b0ee3c46555fa44c09d9a0e357dbca95",
+                    "nonce" : "0xa00afe2e29a352de",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x75d2ca6c8aabd76d8466ea40c1eb93bd88e11ff8b909f569a499399104367fb1",
-                    "stateRoot" : "0x4204bb99846e824ee99d79eb18cebf2957f25a278ae1fd78f120d58ff5994f93",
+                    "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
+                    "stateRoot" : "0x73f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc6fcce87b155ced48f6e1838395379b62f402e24efd6d52f1a9d7467c772c0a6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04204bb99846e824ee99d79eb18cebf2957f25a278ae1fd78f120d58ff5994f93a0c6fcce87b155ced48f6e1838395379b62f402e24efd6d52f1a9d7467c772c0a6a075d2ca6c8aabd76d8466ea40c1eb93bd88e11ff8b909f569a499399104367fb1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021f7f8203e880a0998a812b614f9d30b6891278ba69c91dd4c9ec39fb56a73767e984cc8c9a35a6881dd15e98025d434cf882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca091481ae028622c3978e865c8429c310dd6b3ec68f47708f935e8ea6c110de199a0384f50dc1f42bc7c3570212b940b6663d328104f2fcc936ae8871102b4073f0fc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea0c6fcce87b155ced48f6e1838395379b62f402e24efd6d52f1a9d7467c772c0a6a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a071f7d953541af524ec1b38e09c5a18b4b0ee3c46555fa44c09d9a0e357dbca9588a00afe2e29a352def882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca091481ae028622c3978e865c8429c310dd6b3ec68f47708f935e8ea6c110de199a0384f50dc1f42bc7c3570212b940b6663d328104f2fcc936ae8871102b4073f0fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -874,18 +1095,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf90f97438bfe940651c3cc0033819592b94c750d1dd4411ed4389df1861d8199",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x89056a33a41f8bf73733ba2f0512573a82035290697b58976f7e0e20f96d71e5",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f61f7f",
+                "balance" : "0x4563918244f67100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -910,8 +1124,6 @@
                 "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x04" : "0x0c",
-                    "0x05" : "0x0c"
                 }
             },
             "0xa300000000000000000000000000000000000000" : {
@@ -922,7 +1134,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2f081",
+                "balance" : "0xe8d4a29f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g2v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g2v1.json
index c45915af4..379a6a69a 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g2v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g2v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d2g2v1_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d2g2v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g2v1Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x026920",
-                    "hash" : "0xa89d72ee2a3c4c023a70a9fefebba925fca3237b6c9bc9ee0ac8b60c80147639",
-                    "mixHash" : "0xb99ae63642913b5b0cd9fbe1640306a7a4a7763a8b4d1d729865ae82dee74696",
-                    "nonce" : "0xec6c1a49ae3d9437",
+                    "gasUsed" : "0x0239ab",
+                    "hash" : "0xe9c7dee0f8b700adeb9d5af8e754712cf9464f01a2decf76bedd26c8133aba48",
+                    "mixHash" : "0x6bdb9af6f41abf19b6a1bde8d61878e6083ccea3e13e99b6302c48aeee1dc407",
+                    "nonce" : "0x191afdfbddb1ec37",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0c",
-                    "stateRoot" : "0xc1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750af",
+                    "receiptTrie" : "0x786f50ef0f9058903c2f60c0435d2be9c367ce7c75e807be848e1049fa606652",
+                    "stateRoot" : "0xcee2515918e31edbd2caabe21f13a44e3245943c7c5a7926448f3792288017e5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8a47d9d1c73611919638846c93439432070adc5ec80b66b9fa1118320ba8de77",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750afa08a47d9d1c73611919638846c93439432070adc5ec80b66b9fa1118320ba8de77a0ab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830269208203e880a0b99ae63642913b5b0cd9fbe1640306a7a4a7763a8b4d1d729865ae82dee7469688ec6c1a49ae3d9437f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba055d49d5ad66a76243679c4970dfac65f9b7be0fbd90b8fff6e4c04439b876958a063e51d48e0849a35e21b7b8dbb5128e441b19370629d50eed337e4c6a48c3a84c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cee2515918e31edbd2caabe21f13a44e3245943c7c5a7926448f3792288017e5a08a47d9d1c73611919638846c93439432070adc5ec80b66b9fa1118320ba8de77a0786f50ef0f9058903c2f60c0435d2be9c367ce7c75e807be848e1049fa606652b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239ab8203e880a06bdb9af6f41abf19b6a1bde8d61878e6083ccea3e13e99b6302c48aeee1dc40788191afdfbddb1ec37f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba055d49d5ad66a76243679c4970dfac65f9b7be0fbd90b8fff6e4c04439b876958a063e51d48e0849a35e21b7b8dbb5128e441b19370629d50eed337e4c6a48c3a84c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa89d72ee2a3c4c023a70a9fefebba925fca3237b6c9bc9ee0ac8b60c80147639",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe9c7dee0f8b700adeb9d5af8e754712cf9464f01a2decf76bedd26c8133aba48",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f66920",
+                "balance" : "0x4563918244f639ab",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -87,10 +94,12 @@
                 }
             },
             "0xa200000000000000000000000000000000000000" : {
-                "balance" : "0x00",
+                "balance" : "0x0a",
                 "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c"
                 }
             },
             "0xa300000000000000000000000000000000000000" : {
@@ -101,14 +110,226 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2a6d6",
+                "balance" : "0xe8d4a2d64b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d2g2v1_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g2v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0239ab",
+                    "hash" : "0xccd0367a62ece1e4a3a5069a43bacfab609a048e1efb699aba74f6ac15cbb311",
+                    "mixHash" : "0x1e5d51c2ea381159b4146b9556a0b76b3a75e24a47c65ddab3c840cc3cf5c6d3",
+                    "nonce" : "0x4290b4bae97842f1",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0x786f50ef0f9058903c2f60c0435d2be9c367ce7c75e807be848e1049fa606652",
+                    "stateRoot" : "0xcee2515918e31edbd2caabe21f13a44e3245943c7c5a7926448f3792288017e5",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8a47d9d1c73611919638846c93439432070adc5ec80b66b9fa1118320ba8de77",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cee2515918e31edbd2caabe21f13a44e3245943c7c5a7926448f3792288017e5a08a47d9d1c73611919638846c93439432070adc5ec80b66b9fa1118320ba8de77a0786f50ef0f9058903c2f60c0435d2be9c367ce7c75e807be848e1049fa606652b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239ab8203e880a01e5d51c2ea381159b4146b9556a0b76b3a75e24a47c65ddab3c840cc3cf5c6d3884290b4bae97842f1f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba055d49d5ad66a76243679c4970dfac65f9b7be0fbd90b8fff6e4c04439b876958a063e51d48e0849a35e21b7b8dbb5128e441b19370629d50eed337e4c6a48c3a84c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
+                        "gasLimit" : "0x027100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x55d49d5ad66a76243679c4970dfac65f9b7be0fbd90b8fff6e4c04439b876958",
+                        "s" : "0x63e51d48e0849a35e21b7b8dbb5128e441b19370629d50eed337e4c6a48c3a84",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xccd0367a62ece1e4a3a5069a43bacfab609a048e1efb699aba74f6ac15cbb311",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f639ab",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
                 "balance" : "0x0a",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c"
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2d64b",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
@@ -202,10 +423,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g2v1_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d2g2v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g2v1Filler.json"
         },
         "blocks" : [
@@ -217,9 +438,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x026920",
-                    "hash" : "0x07892d6c6d75605e062b58937c5807551ec5b57dc67b00fdcc4248be831b3fc3",
-                    "mixHash" : "0xcbf3ab9a31f4bcec35147d5eca187a9e82060b2b33463429de6e07d737d2f3cf",
-                    "nonce" : "0x9e38331cb4a57786",
+                    "hash" : "0xca49615bed9785dca439d527dd397fbf260233abf3ed7cc427abd8a604926e8e",
+                    "mixHash" : "0x02b4174ea8872146cc9da63fd1d774f9b98ed438f8e923ac61e793df6a94b17a",
+                    "nonce" : "0x7dd5f6b41e345a6a",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0c",
@@ -228,7 +449,7 @@
                     "transactionsTrie" : "0x8a47d9d1c73611919638846c93439432070adc5ec80b66b9fa1118320ba8de77",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750afa08a47d9d1c73611919638846c93439432070adc5ec80b66b9fa1118320ba8de77a0ab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830269208203e880a0cbf3ab9a31f4bcec35147d5eca187a9e82060b2b33463429de6e07d737d2f3cf889e38331cb4a57786f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba055d49d5ad66a76243679c4970dfac65f9b7be0fbd90b8fff6e4c04439b876958a063e51d48e0849a35e21b7b8dbb5128e441b19370629d50eed337e4c6a48c3a84c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750afa08a47d9d1c73611919638846c93439432070adc5ec80b66b9fa1118320ba8de77a0ab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830269208203e880a002b4174ea8872146cc9da63fd1d774f9b98ed438f8e923ac61e793df6a94b17a887dd5f6b41e345a6af882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba055d49d5ad66a76243679c4970dfac65f9b7be0fbd90b8fff6e4c04439b876958a063e51d48e0849a35e21b7b8dbb5128e441b19370629d50eed337e4c6a48c3a84c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -265,8 +486,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x07892d6c6d75605e062b58937c5807551ec5b57dc67b00fdcc4248be831b3fc3",
-        "network" : "EIP158",
+        "lastblockhash" : "0xca49615bed9785dca439d527dd397fbf260233abf3ed7cc427abd8a604926e8e",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f66920",
@@ -405,10 +626,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g2v1_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d2g2v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g2v1Filler.json"
         },
         "blocks" : [
@@ -419,19 +640,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x027100",
-                    "hash" : "0x30429bad2b62fe0ddc4a00562de96ec4ca468431e727866a697ce81d214a79b3",
-                    "mixHash" : "0xde7af7b4c296375ee461dd38f37849b1ab631935bb7d81e58a8f84c765347aef",
-                    "nonce" : "0xe63c3c1cefd5a07a",
+                    "gasUsed" : "0x026920",
+                    "hash" : "0x99fe4dedcbb7cb4458952561345f419a92670d155ab37ff4c47911d5c6f41e40",
+                    "mixHash" : "0x45e42c0a613db4fb87156e465cd94c2af24423efb9344593f7be5b8657339b5a",
+                    "nonce" : "0x8c00c7cff680a646",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
-                    "stateRoot" : "0x73f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26e",
+                    "receiptTrie" : "0xab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0c",
+                    "stateRoot" : "0xc1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750af",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8a47d9d1c73611919638846c93439432070adc5ec80b66b9fa1118320ba8de77",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea08a47d9d1c73611919638846c93439432070adc5ec80b66b9fa1118320ba8de77a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0de7af7b4c296375ee461dd38f37849b1ab631935bb7d81e58a8f84c765347aef88e63c3c1cefd5a07af882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba055d49d5ad66a76243679c4970dfac65f9b7be0fbd90b8fff6e4c04439b876958a063e51d48e0849a35e21b7b8dbb5128e441b19370629d50eed337e4c6a48c3a84c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750afa08a47d9d1c73611919638846c93439432070adc5ec80b66b9fa1118320ba8de77a0ab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830269208203e880a045e42c0a613db4fb87156e465cd94c2af24423efb9344593f7be5b8657339b5a888c00c7cff680a646f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba055d49d5ad66a76243679c4970dfac65f9b7be0fbd90b8fff6e4c04439b876958a063e51d48e0849a35e21b7b8dbb5128e441b19370629d50eed337e4c6a48c3a84c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -468,11 +689,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x30429bad2b62fe0ddc4a00562de96ec4ca468431e727866a697ce81d214a79b3",
-        "network" : "Frontier",
+        "lastblockhash" : "0x99fe4dedcbb7cb4458952561345f419a92670d155ab37ff4c47911d5c6f41e40",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f67100",
+                "balance" : "0x4563918244f66920",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,14 +728,14 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a29f00",
+                "balance" : "0xe8d4a2a6d6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
-                "balance" : "0x00",
+                "balance" : "0x0a",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
@@ -608,10 +829,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g2v1_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d2g2v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g2v1Filler.json"
         },
         "blocks" : [
@@ -623,9 +844,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0x4921ff2a559d6215e2038c8b48d10ea001be6f7bc43248202494e330535c9b18",
-                    "mixHash" : "0x71ccc72fd15020462621e0f7549757397e190ad4101779fb37cf11dd3cf4bc48",
-                    "nonce" : "0x7a75f16124220e39",
+                    "hash" : "0xad0b96b57fa36b44093673782c783a7d0bbd573a628877e0b7dde4359232f35e",
+                    "mixHash" : "0x4f02da46591830ca1ea93831cddfe9c02c4511e545515895e916ec8838ce310f",
+                    "nonce" : "0x93c357810474899c",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
@@ -634,7 +855,7 @@
                     "transactionsTrie" : "0x8a47d9d1c73611919638846c93439432070adc5ec80b66b9fa1118320ba8de77",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea08a47d9d1c73611919638846c93439432070adc5ec80b66b9fa1118320ba8de77a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a071ccc72fd15020462621e0f7549757397e190ad4101779fb37cf11dd3cf4bc48887a75f16124220e39f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba055d49d5ad66a76243679c4970dfac65f9b7be0fbd90b8fff6e4c04439b876958a063e51d48e0849a35e21b7b8dbb5128e441b19370629d50eed337e4c6a48c3a84c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea08a47d9d1c73611919638846c93439432070adc5ec80b66b9fa1118320ba8de77a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a04f02da46591830ca1ea93831cddfe9c02c4511e545515895e916ec8838ce310f8893c357810474899cf882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba055d49d5ad66a76243679c4970dfac65f9b7be0fbd90b8fff6e4c04439b876958a063e51d48e0849a35e21b7b8dbb5128e441b19370629d50eed337e4c6a48c3a84c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -671,8 +892,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4921ff2a559d6215e2038c8b48d10ea001be6f7bc43248202494e330535c9b18",
-        "network" : "Homestead",
+        "lastblockhash" : "0xad0b96b57fa36b44093673782c783a7d0bbd573a628877e0b7dde4359232f35e",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f67100",
@@ -811,10 +1032,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g2v1_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d2g2v1_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g2v1Filler.json"
         },
         "blocks" : [
@@ -825,19 +1046,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0239ab",
-                    "hash" : "0x4f0fadb4981dc79852523afbb658f8adc842ec5b2b8bb7ca2675b4da68078850",
-                    "mixHash" : "0x5fbb9b2db45534c3ee329e11c13840d689568de6ef9cf8924f5e779c4aa90b86",
-                    "nonce" : "0xaac35fa2e501abff",
+                    "gasUsed" : "0x027100",
+                    "hash" : "0x6cf76388397c54cbcc5f8d295415e02b8ce5f73998079d21d50a59c50dbe539b",
+                    "mixHash" : "0x93ee3a08b1683833cdb19fb8dcbbebda340a82c63f52ec236640147b1733132f",
+                    "nonce" : "0x205be4758dfd665b",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x786f50ef0f9058903c2f60c0435d2be9c367ce7c75e807be848e1049fa606652",
-                    "stateRoot" : "0xcee2515918e31edbd2caabe21f13a44e3245943c7c5a7926448f3792288017e5",
+                    "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
+                    "stateRoot" : "0x73f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8a47d9d1c73611919638846c93439432070adc5ec80b66b9fa1118320ba8de77",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cee2515918e31edbd2caabe21f13a44e3245943c7c5a7926448f3792288017e5a08a47d9d1c73611919638846c93439432070adc5ec80b66b9fa1118320ba8de77a0786f50ef0f9058903c2f60c0435d2be9c367ce7c75e807be848e1049fa606652b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239ab8203e880a05fbb9b2db45534c3ee329e11c13840d689568de6ef9cf8924f5e779c4aa90b8688aac35fa2e501abfff882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba055d49d5ad66a76243679c4970dfac65f9b7be0fbd90b8fff6e4c04439b876958a063e51d48e0849a35e21b7b8dbb5128e441b19370629d50eed337e4c6a48c3a84c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea08a47d9d1c73611919638846c93439432070adc5ec80b66b9fa1118320ba8de77a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a093ee3a08b1683833cdb19fb8dcbbebda340a82c63f52ec236640147b1733132f88205be4758dfd665bf882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba055d49d5ad66a76243679c4970dfac65f9b7be0fbd90b8fff6e4c04439b876958a063e51d48e0849a35e21b7b8dbb5128e441b19370629d50eed337e4c6a48c3a84c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -874,18 +1095,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4f0fadb4981dc79852523afbb658f8adc842ec5b2b8bb7ca2675b4da68078850",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6cf76388397c54cbcc5f8d295415e02b8ce5f73998079d21d50a59c50dbe539b",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f639ab",
+                "balance" : "0x4563918244f67100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -906,12 +1120,10 @@
                 }
             },
             "0xa200000000000000000000000000000000000000" : {
-                "balance" : "0x0a",
+                "balance" : "0x00",
                 "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x04" : "0x0c",
-                    "0x05" : "0x0c"
                 }
             },
             "0xa300000000000000000000000000000000000000" : {
@@ -922,7 +1134,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2d64b",
+                "balance" : "0xe8d4a29f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g3v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g3v0.json
index 1ae175d76..6c09deb59 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g3v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d2g3v0_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d2g3v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g3v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc19a",
-                    "hash" : "0x67d7bebd33ec559a9116551c4dc83dddeaf399663d2c801bbe80565ffc728e91",
-                    "mixHash" : "0x45beb3045f2926a0ca787b2bbd3da3942afd90a83c6e5a247195609492daab9e",
-                    "nonce" : "0xeaba2d24cbb9785b",
+                    "hash" : "0xf927958503c50b1d27b31f4501be0c6fc2b26c304e91873753735e7a25ef1d76",
+                    "mixHash" : "0x40467d1d8f05f665e727845e4455878c1137656b86ce4960b0c7655201dbfe8b",
+                    "nonce" : "0x92aa401c92ff719a",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x49a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2",
-                    "stateRoot" : "0xb4256760b0753a45c56007cb8a35d18a80d9f299b53a760175cc01ceb6ca5f21",
+                    "receiptTrie" : "0xa5d0e8d32ee861e79b211e90c606d96e95bc73bea255ede5fb9fd90bb7cedb39",
+                    "stateRoot" : "0x0725c487930e2041eba0397686c9146c5f6febc65a64f425b8b748883d8428fc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7bdc60ec37d109868eabfb5c88b066675f2665c76e67430ed3c6f481143925d3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4256760b0753a45c56007cb8a35d18a80d9f299b53a760175cc01ceb6ca5f21a07bdc60ec37d109868eabfb5c88b066675f2665c76e67430ed3c6f481143925d3a049a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a045beb3045f2926a0ca787b2bbd3da3942afd90a83c6e5a247195609492daab9e88eaba2d24cbb9785bf881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ba0fe7a5075f4ad43223a5309b31dc33b3c15ea8bde27c39c82f265b7680da1efbfa059abd507f9c4e7bebad8fc79af28ca0f53880f8531480a302be4ade0aeec4b7ac0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00725c487930e2041eba0397686c9146c5f6febc65a64f425b8b748883d8428fca07bdc60ec37d109868eabfb5c88b066675f2665c76e67430ed3c6f481143925d3a0a5d0e8d32ee861e79b211e90c606d96e95bc73bea255ede5fb9fd90bb7cedb39b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a040467d1d8f05f665e727845e4455878c1137656b86ce4960b0c7655201dbfe8b8892aa401c92ff719af881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ba0fe7a5075f4ad43223a5309b31dc33b3c15ea8bde27c39c82f265b7680da1efbfa059abd507f9c4e7bebad8fc79af28ca0f53880f8531480a302be4ade0aeec4b7ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x67d7bebd33ec559a9116551c4dc83dddeaf399663d2c801bbe80565ffc728e91",
-        "network" : "EIP150",
+        "lastblockhash" : "0xf927958503c50b1d27b31f4501be0c6fc2b26c304e91873753735e7a25ef1d76",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c19a",
                 "code" : "",
@@ -202,10 +209,220 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g3v0_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d2g3v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g3v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xc19a",
+                    "hash" : "0x2218748fa55a18472b7ab6c584fcaeca5fe66894867089cb0915a04ae85e23cb",
+                    "mixHash" : "0x41c7e23b036871982cb0ea8e50f54b1e1e32488e55af983987c02fbe2d6f9486",
+                    "nonce" : "0x0a9e28f07821692d",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0xa5d0e8d32ee861e79b211e90c606d96e95bc73bea255ede5fb9fd90bb7cedb39",
+                    "stateRoot" : "0x0725c487930e2041eba0397686c9146c5f6febc65a64f425b8b748883d8428fc",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7bdc60ec37d109868eabfb5c88b066675f2665c76e67430ed3c6f481143925d3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00725c487930e2041eba0397686c9146c5f6febc65a64f425b8b748883d8428fca07bdc60ec37d109868eabfb5c88b066675f2665c76e67430ed3c6f481143925d3a0a5d0e8d32ee861e79b211e90c606d96e95bc73bea255ede5fb9fd90bb7cedb39b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a041c7e23b036871982cb0ea8e50f54b1e1e32488e55af983987c02fbe2d6f9486880a9e28f07821692df881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ba0fe7a5075f4ad43223a5309b31dc33b3c15ea8bde27c39c82f265b7680da1efbfa059abd507f9c4e7bebad8fc79af28ca0f53880f8531480a302be4ade0aeec4b7ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
+                        "gasLimit" : "0xc350",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfe7a5075f4ad43223a5309b31dc33b3c15ea8bde27c39c82f265b7680da1efbf",
+                        "s" : "0x59abd507f9c4e7bebad8fc79af28ca0f53880f8531480a302be4ade0aeec4b7a",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2218748fa55a18472b7ab6c584fcaeca5fe66894867089cb0915a04ae85e23cb",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c19a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a44e66",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d2g3v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g3v0Filler.json"
         },
         "blocks" : [
@@ -217,9 +434,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc19a",
-                    "hash" : "0xc9c91a1384b78bd5088ba229b338267df7e37b6afa4b00a9d29f63e1e547b2ba",
-                    "mixHash" : "0x65bbe1455c9046ffa7c2de5b5a923ccc3167eb5118ec0c45414b187bf6e4dcb3",
-                    "nonce" : "0xc7063cf557e653d2",
+                    "hash" : "0x8227281951de59a88f7bf7d0894df4a3ddef48628fe477dd664eb1d4dc97db20",
+                    "mixHash" : "0xc8974b53045ba1006f26cd7f663afab6f585c2d044acf5facab164c74313a12d",
+                    "nonce" : "0x3160ba8ad4355996",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x49a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2",
@@ -228,7 +445,7 @@
                     "transactionsTrie" : "0x7bdc60ec37d109868eabfb5c88b066675f2665c76e67430ed3c6f481143925d3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4256760b0753a45c56007cb8a35d18a80d9f299b53a760175cc01ceb6ca5f21a07bdc60ec37d109868eabfb5c88b066675f2665c76e67430ed3c6f481143925d3a049a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a065bbe1455c9046ffa7c2de5b5a923ccc3167eb5118ec0c45414b187bf6e4dcb388c7063cf557e653d2f881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ba0fe7a5075f4ad43223a5309b31dc33b3c15ea8bde27c39c82f265b7680da1efbfa059abd507f9c4e7bebad8fc79af28ca0f53880f8531480a302be4ade0aeec4b7ac0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4256760b0753a45c56007cb8a35d18a80d9f299b53a760175cc01ceb6ca5f21a07bdc60ec37d109868eabfb5c88b066675f2665c76e67430ed3c6f481143925d3a049a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a0c8974b53045ba1006f26cd7f663afab6f585c2d044acf5facab164c74313a12d883160ba8ad4355996f881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ba0fe7a5075f4ad43223a5309b31dc33b3c15ea8bde27c39c82f265b7680da1efbfa059abd507f9c4e7bebad8fc79af28ca0f53880f8531480a302be4ade0aeec4b7ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -265,8 +482,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc9c91a1384b78bd5088ba229b338267df7e37b6afa4b00a9d29f63e1e547b2ba",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8227281951de59a88f7bf7d0894df4a3ddef48628fe477dd664eb1d4dc97db20",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c19a",
@@ -405,10 +622,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g3v0_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d2g3v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g3v0Filler.json"
         },
         "blocks" : [
@@ -419,19 +636,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xc350",
-                    "hash" : "0x165ad6e8f7c35f0e9e1eb73ba0465887b1eb75a0f274f2f235988773c4d3c364",
-                    "mixHash" : "0x9fe3ae4004f58f560cf436bab9fae4d1c391771adcb526feed04aa1558fc102a",
-                    "nonce" : "0xad9e29fe41bea04a",
+                    "gasUsed" : "0xc19a",
+                    "hash" : "0x710749832e8f91a0e4e03908979cba884f6e28cba1a278f64732959c66ad9a6d",
+                    "mixHash" : "0xad3fccc1582d058bdaf3f310160e346f822d369923b45d04ca5df76944e8defe",
+                    "nonce" : "0x1b727fe9025efa43",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xb30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5a",
-                    "stateRoot" : "0xda427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5",
+                    "receiptTrie" : "0x49a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2",
+                    "stateRoot" : "0xb4256760b0753a45c56007cb8a35d18a80d9f299b53a760175cc01ceb6ca5f21",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7bdc60ec37d109868eabfb5c88b066675f2665c76e67430ed3c6f481143925d3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a07bdc60ec37d109868eabfb5c88b066675f2665c76e67430ed3c6f481143925d3a0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a09fe3ae4004f58f560cf436bab9fae4d1c391771adcb526feed04aa1558fc102a88ad9e29fe41bea04af881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ba0fe7a5075f4ad43223a5309b31dc33b3c15ea8bde27c39c82f265b7680da1efbfa059abd507f9c4e7bebad8fc79af28ca0f53880f8531480a302be4ade0aeec4b7ac0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4256760b0753a45c56007cb8a35d18a80d9f299b53a760175cc01ceb6ca5f21a07bdc60ec37d109868eabfb5c88b066675f2665c76e67430ed3c6f481143925d3a049a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a0ad3fccc1582d058bdaf3f310160e346f822d369923b45d04ca5df76944e8defe881b727fe9025efa43f881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ba0fe7a5075f4ad43223a5309b31dc33b3c15ea8bde27c39c82f265b7680da1efbfa059abd507f9c4e7bebad8fc79af28ca0f53880f8531480a302be4ade0aeec4b7ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -468,11 +685,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x165ad6e8f7c35f0e9e1eb73ba0465887b1eb75a0f274f2f235988773c4d3c364",
-        "network" : "Frontier",
+        "lastblockhash" : "0x710749832e8f91a0e4e03908979cba884f6e28cba1a278f64732959c66ad9a6d",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4c350",
+                "balance" : "0x4563918244f4c19a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,7 +724,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a44cb0",
+                "balance" : "0xe8d4a44e66",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -608,10 +825,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g3v0_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d2g3v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g3v0Filler.json"
         },
         "blocks" : [
@@ -623,9 +840,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc350",
-                    "hash" : "0xf08eabf9670e21a3ee687fd57810484aa1dacebbf6753f9457830ee6d2dbe8ed",
-                    "mixHash" : "0x1bed3108326ae847f2c8b5dc809a7c5cf300b6931b99dbe5b53ee27d3d8ea4d3",
-                    "nonce" : "0x5b5b9a5362cfae98",
+                    "hash" : "0xbf174128ca55d32d8fb8b508fab12a2d3f2b4414505c7d60a8348b951ac353b1",
+                    "mixHash" : "0xc8763519c2caf67a10185300d2596e352081772c792ff8c04f69d99619bb890b",
+                    "nonce" : "0x6d3ff4389ead0d74",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xb30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5a",
@@ -634,7 +851,7 @@
                     "transactionsTrie" : "0x7bdc60ec37d109868eabfb5c88b066675f2665c76e67430ed3c6f481143925d3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a07bdc60ec37d109868eabfb5c88b066675f2665c76e67430ed3c6f481143925d3a0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a01bed3108326ae847f2c8b5dc809a7c5cf300b6931b99dbe5b53ee27d3d8ea4d3885b5b9a5362cfae98f881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ba0fe7a5075f4ad43223a5309b31dc33b3c15ea8bde27c39c82f265b7680da1efbfa059abd507f9c4e7bebad8fc79af28ca0f53880f8531480a302be4ade0aeec4b7ac0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a07bdc60ec37d109868eabfb5c88b066675f2665c76e67430ed3c6f481143925d3a0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a0c8763519c2caf67a10185300d2596e352081772c792ff8c04f69d99619bb890b886d3ff4389ead0d74f881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ba0fe7a5075f4ad43223a5309b31dc33b3c15ea8bde27c39c82f265b7680da1efbfa059abd507f9c4e7bebad8fc79af28ca0f53880f8531480a302be4ade0aeec4b7ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -671,8 +888,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf08eabf9670e21a3ee687fd57810484aa1dacebbf6753f9457830ee6d2dbe8ed",
-        "network" : "Homestead",
+        "lastblockhash" : "0xbf174128ca55d32d8fb8b508fab12a2d3f2b4414505c7d60a8348b951ac353b1",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c350",
@@ -811,10 +1028,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g3v0_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d2g3v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g3v0Filler.json"
         },
         "blocks" : [
@@ -825,19 +1042,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xc19a",
-                    "hash" : "0xd54f7a53bef6de32f4ca49aa0be315f91f584eb2cadf8484157755f8ffcc86cc",
-                    "mixHash" : "0x339b589105a3d98d94557bf11410d442d2546a76a707cd6f98a2f2e26ef2563b",
-                    "nonce" : "0x693936dac1814899",
+                    "gasUsed" : "0xc350",
+                    "hash" : "0x5943a7c85197962a4410be6028f97c21742635c08776690af1788fa660f0269f",
+                    "mixHash" : "0xb47aef5f459345322fb3a41df45fc7fd74d8245cf44956c1daed90f0a0535f36",
+                    "nonce" : "0x9fd7de88c998e3e5",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xa5d0e8d32ee861e79b211e90c606d96e95bc73bea255ede5fb9fd90bb7cedb39",
-                    "stateRoot" : "0x0725c487930e2041eba0397686c9146c5f6febc65a64f425b8b748883d8428fc",
+                    "receiptTrie" : "0xb30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5a",
+                    "stateRoot" : "0xda427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7bdc60ec37d109868eabfb5c88b066675f2665c76e67430ed3c6f481143925d3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00725c487930e2041eba0397686c9146c5f6febc65a64f425b8b748883d8428fca07bdc60ec37d109868eabfb5c88b066675f2665c76e67430ed3c6f481143925d3a0a5d0e8d32ee861e79b211e90c606d96e95bc73bea255ede5fb9fd90bb7cedb39b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a0339b589105a3d98d94557bf11410d442d2546a76a707cd6f98a2f2e26ef2563b88693936dac1814899f881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ba0fe7a5075f4ad43223a5309b31dc33b3c15ea8bde27c39c82f265b7680da1efbfa059abd507f9c4e7bebad8fc79af28ca0f53880f8531480a302be4ade0aeec4b7ac0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a07bdc60ec37d109868eabfb5c88b066675f2665c76e67430ed3c6f481143925d3a0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a0b47aef5f459345322fb3a41df45fc7fd74d8245cf44956c1daed90f0a0535f36889fd7de88c998e3e5f881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ba0fe7a5075f4ad43223a5309b31dc33b3c15ea8bde27c39c82f265b7680da1efbfa059abd507f9c4e7bebad8fc79af28ca0f53880f8531480a302be4ade0aeec4b7ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -874,18 +1091,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd54f7a53bef6de32f4ca49aa0be315f91f584eb2cadf8484157755f8ffcc86cc",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x5943a7c85197962a4410be6028f97c21742635c08776690af1788fa660f0269f",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4c19a",
+                "balance" : "0x4563918244f4c350",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -920,7 +1130,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a44e66",
+                "balance" : "0xe8d4a44cb0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g3v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g3v1.json
index 9ea700b35..655e2bb07 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g3v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d2g3v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d2g3v1_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d2g3v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g3v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc226",
-                    "hash" : "0xaf164776430188872ebfb19a92438e15d9d0f68946fe3ef20b19af085a46ee33",
-                    "mixHash" : "0xf220952938abc50e58b954f76412a40fd5558e21e55ddc9f63fa7ea2b975a9e2",
-                    "nonce" : "0x37c8abe164a64206",
+                    "hash" : "0xd3ffccd311186084d53e8ab09fa7607277884345400244fac7ce76a7d1c9e2c6",
+                    "mixHash" : "0x54338d71b1da957080eff30aff6a922d5c938781667685401a4724bfe27ef98f",
+                    "nonce" : "0x8d9bea323dd2532b",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xc08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4c",
-                    "stateRoot" : "0xede8b4f79f3e9d00052f7a6111b2b15b7d2784ead53ac798c77024c2f0cb5b06",
+                    "receiptTrie" : "0xbe3284c0f7a475fbc5c36b9a141a86ede36cdafe3c5e0928c790f55bab94282f",
+                    "stateRoot" : "0x3213a013e840252b435ab91b5ecc837800928f2d3ccef81bdc358cbd7f78e69b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x53ddc77485de88d29b15c1b74b503ff5e8dfb4a45c55eee9575fbd5e5b4fa910",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ede8b4f79f3e9d00052f7a6111b2b15b7d2784ead53ac798c77024c2f0cb5b06a053ddc77485de88d29b15c1b74b503ff5e8dfb4a45c55eee9575fbd5e5b4fa910a0c08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a0f220952938abc50e58b954f76412a40fd5558e21e55ddc9f63fa7ea2b975a9e28837c8abe164a64206f881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba05618016fb6bea31f3a87f63a59d6c52aa9663b2b95e322a7296daca5412268f3a00b228fdf03135d620e42c355c4c7cb2e7363f5639c992601eb926835c06aed0ac0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03213a013e840252b435ab91b5ecc837800928f2d3ccef81bdc358cbd7f78e69ba053ddc77485de88d29b15c1b74b503ff5e8dfb4a45c55eee9575fbd5e5b4fa910a0be3284c0f7a475fbc5c36b9a141a86ede36cdafe3c5e0928c790f55bab94282fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a054338d71b1da957080eff30aff6a922d5c938781667685401a4724bfe27ef98f888d9bea323dd2532bf881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba05618016fb6bea31f3a87f63a59d6c52aa9663b2b95e322a7296daca5412268f3a00b228fdf03135d620e42c355c4c7cb2e7363f5639c992601eb926835c06aed0ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaf164776430188872ebfb19a92438e15d9d0f68946fe3ef20b19af085a46ee33",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd3ffccd311186084d53e8ab09fa7607277884345400244fac7ce76a7d1c9e2c6",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c226",
                 "code" : "",
@@ -202,10 +209,220 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g3v1_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d2g3v1_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g3v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xc226",
+                    "hash" : "0xd584cb55d0e03fc29e0b836654d3cceaff63af0fded350d1ae1f9f433198a659",
+                    "mixHash" : "0x29af10ce6a4a66adc6a876587efbb603ddc6819adc5836477f320cab4c733496",
+                    "nonce" : "0x26dfe3d31f0eec06",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0xbe3284c0f7a475fbc5c36b9a141a86ede36cdafe3c5e0928c790f55bab94282f",
+                    "stateRoot" : "0x3213a013e840252b435ab91b5ecc837800928f2d3ccef81bdc358cbd7f78e69b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x53ddc77485de88d29b15c1b74b503ff5e8dfb4a45c55eee9575fbd5e5b4fa910",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03213a013e840252b435ab91b5ecc837800928f2d3ccef81bdc358cbd7f78e69ba053ddc77485de88d29b15c1b74b503ff5e8dfb4a45c55eee9575fbd5e5b4fa910a0be3284c0f7a475fbc5c36b9a141a86ede36cdafe3c5e0928c790f55bab94282fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a029af10ce6a4a66adc6a876587efbb603ddc6819adc5836477f320cab4c7334968826dfe3d31f0eec06f881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba05618016fb6bea31f3a87f63a59d6c52aa9663b2b95e322a7296daca5412268f3a00b228fdf03135d620e42c355c4c7cb2e7363f5639c992601eb926835c06aed0ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
+                        "gasLimit" : "0xc350",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5618016fb6bea31f3a87f63a59d6c52aa9663b2b95e322a7296daca5412268f3",
+                        "s" : "0x0b228fdf03135d620e42c355c4c7cb2e7363f5639c992601eb926835c06aed0a",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd584cb55d0e03fc29e0b836654d3cceaff63af0fded350d1ae1f9f433198a659",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c226",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a44dd0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x0a",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d2g3v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g3v1Filler.json"
         },
         "blocks" : [
@@ -217,9 +434,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc226",
-                    "hash" : "0x9bb2e35edc67aa3b35573a98b538172415c0c6bd3af8118a9c8a9415c4b665ce",
-                    "mixHash" : "0x8762a4e8063032f9499baada46c91379c8d4ae0c52f331ac71ce88019087fb44",
-                    "nonce" : "0xc80b8233555e0e02",
+                    "hash" : "0x50d44316aad8ea0485ff88dc6b5ad78e39e2c5ceddccdd0dafef48ab10bbd78e",
+                    "mixHash" : "0xbc19c95c6416338febed3b1c6aed4368bb4ca9c3e5b8ac51234d578c9247cdc1",
+                    "nonce" : "0x99c4952e12caf8ea",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xc08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4c",
@@ -228,7 +445,7 @@
                     "transactionsTrie" : "0x53ddc77485de88d29b15c1b74b503ff5e8dfb4a45c55eee9575fbd5e5b4fa910",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ede8b4f79f3e9d00052f7a6111b2b15b7d2784ead53ac798c77024c2f0cb5b06a053ddc77485de88d29b15c1b74b503ff5e8dfb4a45c55eee9575fbd5e5b4fa910a0c08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a08762a4e8063032f9499baada46c91379c8d4ae0c52f331ac71ce88019087fb4488c80b8233555e0e02f881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba05618016fb6bea31f3a87f63a59d6c52aa9663b2b95e322a7296daca5412268f3a00b228fdf03135d620e42c355c4c7cb2e7363f5639c992601eb926835c06aed0ac0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ede8b4f79f3e9d00052f7a6111b2b15b7d2784ead53ac798c77024c2f0cb5b06a053ddc77485de88d29b15c1b74b503ff5e8dfb4a45c55eee9575fbd5e5b4fa910a0c08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a0bc19c95c6416338febed3b1c6aed4368bb4ca9c3e5b8ac51234d578c9247cdc18899c4952e12caf8eaf881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba05618016fb6bea31f3a87f63a59d6c52aa9663b2b95e322a7296daca5412268f3a00b228fdf03135d620e42c355c4c7cb2e7363f5639c992601eb926835c06aed0ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -265,8 +482,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9bb2e35edc67aa3b35573a98b538172415c0c6bd3af8118a9c8a9415c4b665ce",
-        "network" : "EIP158",
+        "lastblockhash" : "0x50d44316aad8ea0485ff88dc6b5ad78e39e2c5ceddccdd0dafef48ab10bbd78e",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c226",
@@ -405,10 +622,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g3v1_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d2g3v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g3v1Filler.json"
         },
         "blocks" : [
@@ -419,19 +636,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xc350",
-                    "hash" : "0x82904095f01b7991d40f1ecdb874a879ae615e68d2f4f97298344a3906fd066d",
-                    "mixHash" : "0x0a758d8f6bf02366efd19f7cab9819a3cf277402e3c2c50a64d32789c4e9aa4d",
-                    "nonce" : "0xadf57fe7f4a3f96e",
+                    "gasUsed" : "0xc226",
+                    "hash" : "0x1a6d0b2d6bc81de303cc982649b7b7dc4ac7a3657830daeacf768de3ee1fe83d",
+                    "mixHash" : "0x2339a482eadd745d327e473d2f5ead76c068581ff1192f1e83590c9b7595a943",
+                    "nonce" : "0x21f236163a9aa9eb",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xb30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5a",
-                    "stateRoot" : "0xda427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5",
+                    "receiptTrie" : "0xc08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4c",
+                    "stateRoot" : "0xede8b4f79f3e9d00052f7a6111b2b15b7d2784ead53ac798c77024c2f0cb5b06",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x53ddc77485de88d29b15c1b74b503ff5e8dfb4a45c55eee9575fbd5e5b4fa910",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a053ddc77485de88d29b15c1b74b503ff5e8dfb4a45c55eee9575fbd5e5b4fa910a0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a00a758d8f6bf02366efd19f7cab9819a3cf277402e3c2c50a64d32789c4e9aa4d88adf57fe7f4a3f96ef881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba05618016fb6bea31f3a87f63a59d6c52aa9663b2b95e322a7296daca5412268f3a00b228fdf03135d620e42c355c4c7cb2e7363f5639c992601eb926835c06aed0ac0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ede8b4f79f3e9d00052f7a6111b2b15b7d2784ead53ac798c77024c2f0cb5b06a053ddc77485de88d29b15c1b74b503ff5e8dfb4a45c55eee9575fbd5e5b4fa910a0c08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a02339a482eadd745d327e473d2f5ead76c068581ff1192f1e83590c9b7595a9438821f236163a9aa9ebf881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba05618016fb6bea31f3a87f63a59d6c52aa9663b2b95e322a7296daca5412268f3a00b228fdf03135d620e42c355c4c7cb2e7363f5639c992601eb926835c06aed0ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -468,11 +685,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x82904095f01b7991d40f1ecdb874a879ae615e68d2f4f97298344a3906fd066d",
-        "network" : "Frontier",
+        "lastblockhash" : "0x1a6d0b2d6bc81de303cc982649b7b7dc4ac7a3657830daeacf768de3ee1fe83d",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4c350",
+                "balance" : "0x4563918244f4c226",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,14 +724,14 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a44cb0",
+                "balance" : "0xe8d4a44dd0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
-                "balance" : "0x00",
+                "balance" : "0x0a",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
@@ -608,10 +825,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g3v1_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d2g3v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g3v1Filler.json"
         },
         "blocks" : [
@@ -623,9 +840,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc350",
-                    "hash" : "0x59d249a20aa2ad54f353685226108ba34a0a98a9ade9e0bca5fd7039dcc06bcd",
-                    "mixHash" : "0xc7bef1dfaad4f111f4f84f83a515912104bd438b43e6c405ae786c20f3ea1f07",
-                    "nonce" : "0xf6715a9efa23e51b",
+                    "hash" : "0xcd5a9b926dd4475481283f4994a69487df6d2a8e0e507e4336f3a59bb432145c",
+                    "mixHash" : "0xff5237d0bd4aa4aac7713f87c65344aac86961d110383a20feb20d39af56b8d0",
+                    "nonce" : "0x54bbf393243a6975",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xb30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5a",
@@ -634,7 +851,7 @@
                     "transactionsTrie" : "0x53ddc77485de88d29b15c1b74b503ff5e8dfb4a45c55eee9575fbd5e5b4fa910",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a053ddc77485de88d29b15c1b74b503ff5e8dfb4a45c55eee9575fbd5e5b4fa910a0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a0c7bef1dfaad4f111f4f84f83a515912104bd438b43e6c405ae786c20f3ea1f0788f6715a9efa23e51bf881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba05618016fb6bea31f3a87f63a59d6c52aa9663b2b95e322a7296daca5412268f3a00b228fdf03135d620e42c355c4c7cb2e7363f5639c992601eb926835c06aed0ac0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a053ddc77485de88d29b15c1b74b503ff5e8dfb4a45c55eee9575fbd5e5b4fa910a0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a0ff5237d0bd4aa4aac7713f87c65344aac86961d110383a20feb20d39af56b8d08854bbf393243a6975f881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba05618016fb6bea31f3a87f63a59d6c52aa9663b2b95e322a7296daca5412268f3a00b228fdf03135d620e42c355c4c7cb2e7363f5639c992601eb926835c06aed0ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -671,8 +888,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x59d249a20aa2ad54f353685226108ba34a0a98a9ade9e0bca5fd7039dcc06bcd",
-        "network" : "Homestead",
+        "lastblockhash" : "0xcd5a9b926dd4475481283f4994a69487df6d2a8e0e507e4336f3a59bb432145c",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c350",
@@ -811,10 +1028,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d2g3v1_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d2g3v1_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d2g3v1Filler.json"
         },
         "blocks" : [
@@ -825,19 +1042,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xc226",
-                    "hash" : "0x6b7da925c5184b8e234a2e502abbd3902ed664116446aecc71c43fc1113ccde1",
-                    "mixHash" : "0xd28eca2d43276a4c1b6e5dc609080bcab05a15ed54448bee60dd39af6e2e83d9",
-                    "nonce" : "0xb2acd057998d51b8",
+                    "gasUsed" : "0xc350",
+                    "hash" : "0x52220ab79210f24d032ea63d299409141e3faa3f4865a8fc5d2cd96fb318ad05",
+                    "mixHash" : "0x59afca8dc53a56522e5307c5c53693cf5de3671493e09362773b9d2217e7a69a",
+                    "nonce" : "0xbd39b2f949dfa021",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xbe3284c0f7a475fbc5c36b9a141a86ede36cdafe3c5e0928c790f55bab94282f",
-                    "stateRoot" : "0x3213a013e840252b435ab91b5ecc837800928f2d3ccef81bdc358cbd7f78e69b",
+                    "receiptTrie" : "0xb30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5a",
+                    "stateRoot" : "0xda427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x53ddc77485de88d29b15c1b74b503ff5e8dfb4a45c55eee9575fbd5e5b4fa910",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03213a013e840252b435ab91b5ecc837800928f2d3ccef81bdc358cbd7f78e69ba053ddc77485de88d29b15c1b74b503ff5e8dfb4a45c55eee9575fbd5e5b4fa910a0be3284c0f7a475fbc5c36b9a141a86ede36cdafe3c5e0928c790f55bab94282fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a0d28eca2d43276a4c1b6e5dc609080bcab05a15ed54448bee60dd39af6e2e83d988b2acd057998d51b8f881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba05618016fb6bea31f3a87f63a59d6c52aa9663b2b95e322a7296daca5412268f3a00b228fdf03135d620e42c355c4c7cb2e7363f5639c992601eb926835c06aed0ac0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a053ddc77485de88d29b15c1b74b503ff5e8dfb4a45c55eee9575fbd5e5b4fa910a0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a059afca8dc53a56522e5307c5c53693cf5de3671493e09362773b9d2217e7a69a88bd39b2f949dfa021f881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a2000000000000000000000000000000000000001ba05618016fb6bea31f3a87f63a59d6c52aa9663b2b95e322a7296daca5412268f3a00b228fdf03135d620e42c355c4c7cb2e7363f5639c992601eb926835c06aed0ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -874,18 +1091,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6b7da925c5184b8e234a2e502abbd3902ed664116446aecc71c43fc1113ccde1",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x52220ab79210f24d032ea63d299409141e3faa3f4865a8fc5d2cd96fb318ad05",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4c226",
+                "balance" : "0x4563918244f4c350",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -920,14 +1130,14 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a44dd0",
+                "balance" : "0xe8d4a44cb0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
-                "balance" : "0x0a",
+                "balance" : "0x00",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g0v0.json
index 6a92b6ad8..71aad8920 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d3g0v0_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d3g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x037ee8",
-                    "hash" : "0x58056b1b6ad8bd348029d87bf587a33459963e0d74e5b144b238f4a084669497",
-                    "mixHash" : "0xfd533ec0f64af67137efe3c78e8c7c34274f893e37e0cfc5e74158a0380157f1",
-                    "nonce" : "0x5f856951143316bf",
+                    "gasUsed" : "0x021f85",
+                    "hash" : "0x27e5629a00d63ccf80472030b182c7a65322705084479ed4c2f84cad1f922ac6",
+                    "mixHash" : "0x886f4033b2d726047e962a9e7d7a572cd82141141405d0e637ed8055b863a6db",
+                    "nonce" : "0xd91593a863f75628",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x4d25d3b4bf90ca613c58a0429f295bd733e28c4ccf00e89406689c358201c7bc",
-                    "stateRoot" : "0x692ec8e63349dfaf4978552e22f9dee1c13b848da9f5e3619d95c9e48028c537",
+                    "receiptTrie" : "0x611f34cecb2d24d9e78b3d85cbe275f8b294b60de4354b48063d5fa6c10f3b35",
+                    "stateRoot" : "0xd337a751454f600ba1d646f0bb0af2198d3a98322d58a743dacc73b245eac3b8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7ebfa7e6a26fc03497735b56eb581e5c9fcd185180410a5a386c323c7a0ca29a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0692ec8e63349dfaf4978552e22f9dee1c13b848da9f5e3619d95c9e48028c537a07ebfa7e6a26fc03497735b56eb581e5c9fcd185180410a5a386c323c7a0ca29aa04d25d3b4bf90ca613c58a0429f295bd733e28c4ccf00e89406689c358201c7bcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083037ee88203e880a0fd533ec0f64af67137efe3c78e8c7c34274f893e37e0cfc5e74158a0380157f1885f856951143316bff882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba023fff8b604e77d8d24ca4ffdaf1ebc863292bc723727ddda588be5a4b87f619da071a81dddfc8e2643b8642d51a8f3501804f441f4cf03d0499baafa90265fa09cc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d337a751454f600ba1d646f0bb0af2198d3a98322d58a743dacc73b245eac3b8a07ebfa7e6a26fc03497735b56eb581e5c9fcd185180410a5a386c323c7a0ca29aa0611f34cecb2d24d9e78b3d85cbe275f8b294b60de4354b48063d5fa6c10f3b35b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021f858203e880a0886f4033b2d726047e962a9e7d7a572cd82141141405d0e637ed8055b863a6db88d91593a863f75628f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba023fff8b604e77d8d24ca4ffdaf1ebc863292bc723727ddda588be5a4b87f619da071a81dddfc8e2643b8642d51a8f3501804f441f4cf03d0499baafa90265fa09cc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x58056b1b6ad8bd348029d87bf587a33459963e0d74e5b144b238f4a084669497",
-        "network" : "EIP150",
+        "lastblockhash" : "0x27e5629a00d63ccf80472030b182c7a65322705084479ed4c2f84cad1f922ac6",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f77ee8",
+                "balance" : "0x4563918244f61f85",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -103,7 +110,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a19118",
+                "balance" : "0xe8d4a2f07b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -204,10 +211,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g0v0_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d3g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g0v0Filler.json"
         },
         "blocks" : [
@@ -218,19 +225,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x037ee8",
-                    "hash" : "0x4292956fbc87b61e5a325a5e18653f2bdce5c6248bfff756a85cb90e39f4b877",
-                    "mixHash" : "0x84218876f0c94be099827b6addb28989f601366efc98c5c653ae14c3a98be655",
-                    "nonce" : "0x1c6860c19f3b202a",
+                    "gasUsed" : "0x021f85",
+                    "hash" : "0x1308683491e2ccac02f0ade2eb23167dc1b6d918553519e6fa1c51697801f44c",
+                    "mixHash" : "0x4a975763a2ad62532899ee300fb971e815a6724eb10c66e46fb802837c5f5e6c",
+                    "nonce" : "0xdb8701baef6b6cf4",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x4d25d3b4bf90ca613c58a0429f295bd733e28c4ccf00e89406689c358201c7bc",
-                    "stateRoot" : "0x692ec8e63349dfaf4978552e22f9dee1c13b848da9f5e3619d95c9e48028c537",
+                    "receiptTrie" : "0x611f34cecb2d24d9e78b3d85cbe275f8b294b60de4354b48063d5fa6c10f3b35",
+                    "stateRoot" : "0xd337a751454f600ba1d646f0bb0af2198d3a98322d58a743dacc73b245eac3b8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7ebfa7e6a26fc03497735b56eb581e5c9fcd185180410a5a386c323c7a0ca29a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0692ec8e63349dfaf4978552e22f9dee1c13b848da9f5e3619d95c9e48028c537a07ebfa7e6a26fc03497735b56eb581e5c9fcd185180410a5a386c323c7a0ca29aa04d25d3b4bf90ca613c58a0429f295bd733e28c4ccf00e89406689c358201c7bcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083037ee88203e880a084218876f0c94be099827b6addb28989f601366efc98c5c653ae14c3a98be655881c6860c19f3b202af882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba023fff8b604e77d8d24ca4ffdaf1ebc863292bc723727ddda588be5a4b87f619da071a81dddfc8e2643b8642d51a8f3501804f441f4cf03d0499baafa90265fa09cc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d337a751454f600ba1d646f0bb0af2198d3a98322d58a743dacc73b245eac3b8a07ebfa7e6a26fc03497735b56eb581e5c9fcd185180410a5a386c323c7a0ca29aa0611f34cecb2d24d9e78b3d85cbe275f8b294b60de4354b48063d5fa6c10f3b35b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021f858203e880a04a975763a2ad62532899ee300fb971e815a6724eb10c66e46fb802837c5f5e6c88db8701baef6b6cf4f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba023fff8b604e77d8d24ca4ffdaf1ebc863292bc723727ddda588be5a4b87f619da071a81dddfc8e2643b8642d51a8f3501804f441f4cf03d0499baafa90265fa09cc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -267,11 +274,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4292956fbc87b61e5a325a5e18653f2bdce5c6248bfff756a85cb90e39f4b877",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1308683491e2ccac02f0ade2eb23167dc1b6d918553519e6fa1c51697801f44c",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f77ee8",
+                "balance" : "0x4563918244f61f85",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -308,7 +322,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a19118",
+                "balance" : "0xe8d4a2f07b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -409,10 +423,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g0v0_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d3g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g0v0Filler.json"
         },
         "blocks" : [
@@ -423,19 +437,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x044aa7",
-                    "hash" : "0x187a062260ddda130b73b27781c867b331da30c6ededdfb949f33b19b1317919",
-                    "mixHash" : "0xb4c812d640e7537a86245ee6381a6839f8cf954e1fe2ced6f6cc555d9aeec832",
-                    "nonce" : "0x5a4675ec50920e99",
+                    "gasUsed" : "0x037ee8",
+                    "hash" : "0x40997f34a43f6da6d22796d9e638fc72705d631ffe45309f39a35a548d5be6c7",
+                    "mixHash" : "0x87d722f33b749eb6f75dfb1153aefe8fcb5603e76bec47379efb211b7f46331e",
+                    "nonce" : "0x05e9046fead52a90",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xdd39375edad83f16cc7af96f42309e35a81f090021f77b50ee8adee46895cac5",
-                    "stateRoot" : "0xf4b80b3da15a10d955c11c8eb42fd4676e99032f5e6b959776ab5c54789ad4ff",
+                    "receiptTrie" : "0x4d25d3b4bf90ca613c58a0429f295bd733e28c4ccf00e89406689c358201c7bc",
+                    "stateRoot" : "0x692ec8e63349dfaf4978552e22f9dee1c13b848da9f5e3619d95c9e48028c537",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7ebfa7e6a26fc03497735b56eb581e5c9fcd185180410a5a386c323c7a0ca29a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f4b80b3da15a10d955c11c8eb42fd4676e99032f5e6b959776ab5c54789ad4ffa07ebfa7e6a26fc03497735b56eb581e5c9fcd185180410a5a386c323c7a0ca29aa0dd39375edad83f16cc7af96f42309e35a81f090021f77b50ee8adee46895cac5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083044aa78203e880a0b4c812d640e7537a86245ee6381a6839f8cf954e1fe2ced6f6cc555d9aeec832885a4675ec50920e99f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba023fff8b604e77d8d24ca4ffdaf1ebc863292bc723727ddda588be5a4b87f619da071a81dddfc8e2643b8642d51a8f3501804f441f4cf03d0499baafa90265fa09cc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0692ec8e63349dfaf4978552e22f9dee1c13b848da9f5e3619d95c9e48028c537a07ebfa7e6a26fc03497735b56eb581e5c9fcd185180410a5a386c323c7a0ca29aa04d25d3b4bf90ca613c58a0429f295bd733e28c4ccf00e89406689c358201c7bcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083037ee88203e880a087d722f33b749eb6f75dfb1153aefe8fcb5603e76bec47379efb211b7f46331e8805e9046fead52a90f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba023fff8b604e77d8d24ca4ffdaf1ebc863292bc723727ddda588be5a4b87f619da071a81dddfc8e2643b8642d51a8f3501804f441f4cf03d0499baafa90265fa09cc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -472,11 +486,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x187a062260ddda130b73b27781c867b331da30c6ededdfb949f33b19b1317919",
-        "network" : "Frontier",
+        "lastblockhash" : "0x40997f34a43f6da6d22796d9e638fc72705d631ffe45309f39a35a548d5be6c7",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f84aa7",
+                "balance" : "0x4563918244f77ee8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -508,10 +522,12 @@
                 "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a0c559",
+                "balance" : "0xe8d4a19118",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -612,10 +628,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g0v0_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d3g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g0v0Filler.json"
         },
         "blocks" : [
@@ -626,19 +642,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x037498",
-                    "hash" : "0x66b2c8466a7b06c592c05bbf458557c8ffa2adedb8d2f4662a35837164fbce27",
-                    "mixHash" : "0x4b1167562e8b0324e30c778e3085a246e13e474b5a2fade726c28c3f260a2ca9",
-                    "nonce" : "0xad5e47840b742924",
+                    "gasUsed" : "0x037ee8",
+                    "hash" : "0x595ab9c75ef7f931a3ca5705f5596dfe5b492d6e4db9c5661adbf22485fff5d4",
+                    "mixHash" : "0x65c5487615f57d2a98ab9a223090f7051f87ff03fa79d09172c7ac65f0a5295d",
+                    "nonce" : "0x24aa648b8856510e",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xf4065d58eaf57c23062bfeb3675d686ea3924f62f70c9bab05fd7562b88b349c",
-                    "stateRoot" : "0xa39ef1427de92f084b2b921c80bd06da97568f220a043d545e983696db1eb866",
+                    "receiptTrie" : "0x4d25d3b4bf90ca613c58a0429f295bd733e28c4ccf00e89406689c358201c7bc",
+                    "stateRoot" : "0x692ec8e63349dfaf4978552e22f9dee1c13b848da9f5e3619d95c9e48028c537",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7ebfa7e6a26fc03497735b56eb581e5c9fcd185180410a5a386c323c7a0ca29a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a39ef1427de92f084b2b921c80bd06da97568f220a043d545e983696db1eb866a07ebfa7e6a26fc03497735b56eb581e5c9fcd185180410a5a386c323c7a0ca29aa0f4065d58eaf57c23062bfeb3675d686ea3924f62f70c9bab05fd7562b88b349cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830374988203e880a04b1167562e8b0324e30c778e3085a246e13e474b5a2fade726c28c3f260a2ca988ad5e47840b742924f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba023fff8b604e77d8d24ca4ffdaf1ebc863292bc723727ddda588be5a4b87f619da071a81dddfc8e2643b8642d51a8f3501804f441f4cf03d0499baafa90265fa09cc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0692ec8e63349dfaf4978552e22f9dee1c13b848da9f5e3619d95c9e48028c537a07ebfa7e6a26fc03497735b56eb581e5c9fcd185180410a5a386c323c7a0ca29aa04d25d3b4bf90ca613c58a0429f295bd733e28c4ccf00e89406689c358201c7bcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083037ee88203e880a065c5487615f57d2a98ab9a223090f7051f87ff03fa79d09172c7ac65f0a5295d8824aa648b8856510ef882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba023fff8b604e77d8d24ca4ffdaf1ebc863292bc723727ddda588be5a4b87f619da071a81dddfc8e2643b8642d51a8f3501804f441f4cf03d0499baafa90265fa09cc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -675,11 +691,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x66b2c8466a7b06c592c05bbf458557c8ffa2adedb8d2f4662a35837164fbce27",
-        "network" : "Homestead",
+        "lastblockhash" : "0x595ab9c75ef7f931a3ca5705f5596dfe5b492d6e4db9c5661adbf22485fff5d4",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f77498",
+                "balance" : "0x4563918244f77ee8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -716,7 +732,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a19b68",
+                "balance" : "0xe8d4a19118",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -817,10 +833,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g0v0_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d3g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g0v0Filler.json"
         },
         "blocks" : [
@@ -831,19 +847,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x021f85",
-                    "hash" : "0x05276bad164aa2957b3e011afeacc70ed78d40429f21f57e5f9256e34125d39f",
-                    "mixHash" : "0xedb0d5ade7403e2db59fb68e1f646457cdbc61d83785f9eb51c492c702c6db70",
-                    "nonce" : "0xea78105273c0e1cd",
+                    "gasUsed" : "0x044aa7",
+                    "hash" : "0x838a3a29ef51b2a01ae3ff31eaf24ab10094073c713fe0619ebcfb7714a6eb73",
+                    "mixHash" : "0x9c7769211c66438b0786f7cefafa10807ac8e040be84dccb8ec29d23a1ef64bc",
+                    "nonce" : "0xf2e1a9338faa0b1b",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x611f34cecb2d24d9e78b3d85cbe275f8b294b60de4354b48063d5fa6c10f3b35",
-                    "stateRoot" : "0xd337a751454f600ba1d646f0bb0af2198d3a98322d58a743dacc73b245eac3b8",
+                    "receiptTrie" : "0xdd39375edad83f16cc7af96f42309e35a81f090021f77b50ee8adee46895cac5",
+                    "stateRoot" : "0xf4b80b3da15a10d955c11c8eb42fd4676e99032f5e6b959776ab5c54789ad4ff",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7ebfa7e6a26fc03497735b56eb581e5c9fcd185180410a5a386c323c7a0ca29a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d337a751454f600ba1d646f0bb0af2198d3a98322d58a743dacc73b245eac3b8a07ebfa7e6a26fc03497735b56eb581e5c9fcd185180410a5a386c323c7a0ca29aa0611f34cecb2d24d9e78b3d85cbe275f8b294b60de4354b48063d5fa6c10f3b35b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021f858203e880a0edb0d5ade7403e2db59fb68e1f646457cdbc61d83785f9eb51c492c702c6db7088ea78105273c0e1cdf882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba023fff8b604e77d8d24ca4ffdaf1ebc863292bc723727ddda588be5a4b87f619da071a81dddfc8e2643b8642d51a8f3501804f441f4cf03d0499baafa90265fa09cc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f4b80b3da15a10d955c11c8eb42fd4676e99032f5e6b959776ab5c54789ad4ffa07ebfa7e6a26fc03497735b56eb581e5c9fcd185180410a5a386c323c7a0ca29aa0dd39375edad83f16cc7af96f42309e35a81f090021f77b50ee8adee46895cac5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083044aa78203e880a09c7769211c66438b0786f7cefafa10807ac8e040be84dccb8ec29d23a1ef64bc88f2e1a9338faa0b1bf882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba023fff8b604e77d8d24ca4ffdaf1ebc863292bc723727ddda588be5a4b87f619da071a81dddfc8e2643b8642d51a8f3501804f441f4cf03d0499baafa90265fa09cc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -880,18 +896,214 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x05276bad164aa2957b3e011afeacc70ed78d40429f21f57e5f9256e34125d39f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x838a3a29ef51b2a01ae3ff31eaf24ab10094073c713fe0619ebcfb7714a6eb73",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f84aa7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a0c559",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d3g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x037498",
+                    "hash" : "0x04891d73d5d938fceb02077fc46597e698fb125ecf6d74e448ea498c5a78e929",
+                    "mixHash" : "0x63b508337f0d33e1608242276dacce40a4f638acad03f3d6f1ff73d000a7dda8",
+                    "nonce" : "0x1c04d8b59da84d75",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0xf4065d58eaf57c23062bfeb3675d686ea3924f62f70c9bab05fd7562b88b349c",
+                    "stateRoot" : "0xa39ef1427de92f084b2b921c80bd06da97568f220a043d545e983696db1eb866",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7ebfa7e6a26fc03497735b56eb581e5c9fcd185180410a5a386c323c7a0ca29a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a39ef1427de92f084b2b921c80bd06da97568f220a043d545e983696db1eb866a07ebfa7e6a26fc03497735b56eb581e5c9fcd185180410a5a386c323c7a0ca29aa0f4065d58eaf57c23062bfeb3675d686ea3924f62f70c9bab05fd7562b88b349cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830374988203e880a063b508337f0d33e1608242276dacce40a4f638acad03f3d6f1ff73d000a7dda8881c04d8b59da84d75f882f8808001830c350094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba023fff8b604e77d8d24ca4ffdaf1ebc863292bc723727ddda588be5a4b87f619da071a81dddfc8e2643b8642d51a8f3501804f441f4cf03d0499baafa90265fa09cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
+                        "gasLimit" : "0x0c3500",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x23fff8b604e77d8d24ca4ffdaf1ebc863292bc723727ddda588be5a4b87f619d",
+                        "s" : "0x71a81dddfc8e2643b8642d51a8f3501804f441f4cf03d0499baafa90265fa09c",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x04891d73d5d938fceb02077fc46597e698fb125ecf6d74e448ea498c5a78e929",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f61f85",
+                "balance" : "0x4563918244f77498",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -928,7 +1140,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2f07b",
+                "balance" : "0xe8d4a19b68",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g0v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g0v1.json
index 2312adfa2..154869f69 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g0v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g0v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d3g0v1_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d3g0v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g0v1Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x039914",
-                    "hash" : "0x5bdfe0d5a4f53dd1b760304cf1fb05f0826e799274cc7179ca55281f2ec29d83",
-                    "mixHash" : "0x5bac373033f560cbd7e7599113f2ac47f946e5d8b82bb78866d952d1569b5404",
-                    "nonce" : "0x2d7c3f458cb60851",
+                    "gasUsed" : "0x0239b1",
+                    "hash" : "0x66b6d09aed2f7df2b2c2e2629182870eee826df71d48556dbffe8d2d7edb66a2",
+                    "mixHash" : "0xe95841a5b5a68d71dda4373ac9d56d32f021d42ed02d32a976c7b7144e65afe6",
+                    "nonce" : "0x4e4a3794a452faef",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x86c6c20d294c1127e9da3c3c8fd0bb1756ef72bdffc42bc941785ddfdfae65b7",
-                    "stateRoot" : "0x47001c4eb38e9ef7a2be5a14e4704958d833f8135eb26f7d8e8c464073e33548",
+                    "receiptTrie" : "0x0dbafe61adf97a116d70e0ff51248faa1c5eb43b68b1192ed798d9c14e847c3f",
+                    "stateRoot" : "0x0d59e1e847c80f9897465234c5e98375d4f64060af57ffef427880b340c2a17e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc1286a7ef6ef411d849ca4ca4bc9a87c6eec4dc5197d57b571246747fbd99125",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa047001c4eb38e9ef7a2be5a14e4704958d833f8135eb26f7d8e8c464073e33548a0c1286a7ef6ef411d849ca4ca4bc9a87c6eec4dc5197d57b571246747fbd99125a086c6c20d294c1127e9da3c3c8fd0bb1756ef72bdffc42bc941785ddfdfae65b7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830399148203e880a05bac373033f560cbd7e7599113f2ac47f946e5d8b82bb78866d952d1569b5404882d7c3f458cb60851f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ba02bf86e35b6ac9d487c79a28a6e72728536276ec54203a3917681d0f53094dd97a0719635f81cfadec7b6e887add2e70f293a736ec911807b97fbc0c22124f1ceeac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00d59e1e847c80f9897465234c5e98375d4f64060af57ffef427880b340c2a17ea0c1286a7ef6ef411d849ca4ca4bc9a87c6eec4dc5197d57b571246747fbd99125a00dbafe61adf97a116d70e0ff51248faa1c5eb43b68b1192ed798d9c14e847c3fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239b18203e880a0e95841a5b5a68d71dda4373ac9d56d32f021d42ed02d32a976c7b7144e65afe6884e4a3794a452faeff882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ba02bf86e35b6ac9d487c79a28a6e72728536276ec54203a3917681d0f53094dd97a0719635f81cfadec7b6e887add2e70f293a736ec911807b97fbc0c22124f1ceeac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5bdfe0d5a4f53dd1b760304cf1fb05f0826e799274cc7179ca55281f2ec29d83",
-        "network" : "EIP150",
+        "lastblockhash" : "0x66b6d09aed2f7df2b2c2e2629182870eee826df71d48556dbffe8d2d7edb66a2",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f79914",
+                "balance" : "0x4563918244f639b1",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -103,7 +110,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a176e2",
+                "balance" : "0xe8d4a2d645",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -204,10 +211,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g0v1_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d3g0v1_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g0v1Filler.json"
         },
         "blocks" : [
@@ -218,19 +225,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x039914",
-                    "hash" : "0xd724dba665d33c0b3dd746bced22b47be85c7928c75346d7281ed364b4293907",
-                    "mixHash" : "0x05ce063a10af526eb1fd59672e07390ad1ab18a278e42faeac29e3d37ac3f327",
-                    "nonce" : "0x3f8ba4cd0b2296f4",
+                    "gasUsed" : "0x0239b1",
+                    "hash" : "0x869a1b9865767b18886954ff96fd2132fc65ccfa5a207bc4be5fd4f383fc7a20",
+                    "mixHash" : "0x564e7c988f0d68f47ccf1a4a4b168d6b9770fbe900b4ac5dc471eb5e87c094f1",
+                    "nonce" : "0xb7c1d99a21ce0e47",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x86c6c20d294c1127e9da3c3c8fd0bb1756ef72bdffc42bc941785ddfdfae65b7",
-                    "stateRoot" : "0x47001c4eb38e9ef7a2be5a14e4704958d833f8135eb26f7d8e8c464073e33548",
+                    "receiptTrie" : "0x0dbafe61adf97a116d70e0ff51248faa1c5eb43b68b1192ed798d9c14e847c3f",
+                    "stateRoot" : "0x0d59e1e847c80f9897465234c5e98375d4f64060af57ffef427880b340c2a17e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc1286a7ef6ef411d849ca4ca4bc9a87c6eec4dc5197d57b571246747fbd99125",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa047001c4eb38e9ef7a2be5a14e4704958d833f8135eb26f7d8e8c464073e33548a0c1286a7ef6ef411d849ca4ca4bc9a87c6eec4dc5197d57b571246747fbd99125a086c6c20d294c1127e9da3c3c8fd0bb1756ef72bdffc42bc941785ddfdfae65b7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830399148203e880a005ce063a10af526eb1fd59672e07390ad1ab18a278e42faeac29e3d37ac3f327883f8ba4cd0b2296f4f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ba02bf86e35b6ac9d487c79a28a6e72728536276ec54203a3917681d0f53094dd97a0719635f81cfadec7b6e887add2e70f293a736ec911807b97fbc0c22124f1ceeac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00d59e1e847c80f9897465234c5e98375d4f64060af57ffef427880b340c2a17ea0c1286a7ef6ef411d849ca4ca4bc9a87c6eec4dc5197d57b571246747fbd99125a00dbafe61adf97a116d70e0ff51248faa1c5eb43b68b1192ed798d9c14e847c3fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239b18203e880a0564e7c988f0d68f47ccf1a4a4b168d6b9770fbe900b4ac5dc471eb5e87c094f188b7c1d99a21ce0e47f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ba02bf86e35b6ac9d487c79a28a6e72728536276ec54203a3917681d0f53094dd97a0719635f81cfadec7b6e887add2e70f293a736ec911807b97fbc0c22124f1ceeac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -267,11 +274,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd724dba665d33c0b3dd746bced22b47be85c7928c75346d7281ed364b4293907",
-        "network" : "EIP158",
+        "lastblockhash" : "0x869a1b9865767b18886954ff96fd2132fc65ccfa5a207bc4be5fd4f383fc7a20",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f79914",
+                "balance" : "0x4563918244f639b1",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -308,7 +322,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a176e2",
+                "balance" : "0xe8d4a2d645",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -409,10 +423,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g0v1_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d3g0v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g0v1Filler.json"
         },
         "blocks" : [
@@ -423,19 +437,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x046dcf",
-                    "hash" : "0xe7ef5a54372a614d49b2268214f87bd300dc3054a23d6895d31d3672a498fe9c",
-                    "mixHash" : "0x247c7105ff9b03f9f15f23a4e5e48c1729049622e27652228f07c440353501f4",
-                    "nonce" : "0x04b36a6640f29af3",
+                    "gasUsed" : "0x039914",
+                    "hash" : "0x9e3274e9a97c7ae3422568dad4fd6250bc9dd8410ef2d49d23855aa1939f1b40",
+                    "mixHash" : "0xfae6425577c73aff892ee86a47a73eaea13ec1e1fdc5914c5939dbf65f2c5bb8",
+                    "nonce" : "0xd708884e37326129",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x21d1cbb68c10b642696984267d5e668daba80dda5858b3079549027e0db5cca9",
-                    "stateRoot" : "0x053ba5fc619833abbc2c2ad4f33ace4e843ef499927baee5e628bb2ee54f289e",
+                    "receiptTrie" : "0x86c6c20d294c1127e9da3c3c8fd0bb1756ef72bdffc42bc941785ddfdfae65b7",
+                    "stateRoot" : "0x47001c4eb38e9ef7a2be5a14e4704958d833f8135eb26f7d8e8c464073e33548",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc1286a7ef6ef411d849ca4ca4bc9a87c6eec4dc5197d57b571246747fbd99125",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0053ba5fc619833abbc2c2ad4f33ace4e843ef499927baee5e628bb2ee54f289ea0c1286a7ef6ef411d849ca4ca4bc9a87c6eec4dc5197d57b571246747fbd99125a021d1cbb68c10b642696984267d5e668daba80dda5858b3079549027e0db5cca9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083046dcf8203e880a0247c7105ff9b03f9f15f23a4e5e48c1729049622e27652228f07c440353501f48804b36a6640f29af3f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ba02bf86e35b6ac9d487c79a28a6e72728536276ec54203a3917681d0f53094dd97a0719635f81cfadec7b6e887add2e70f293a736ec911807b97fbc0c22124f1ceeac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa047001c4eb38e9ef7a2be5a14e4704958d833f8135eb26f7d8e8c464073e33548a0c1286a7ef6ef411d849ca4ca4bc9a87c6eec4dc5197d57b571246747fbd99125a086c6c20d294c1127e9da3c3c8fd0bb1756ef72bdffc42bc941785ddfdfae65b7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830399148203e880a0fae6425577c73aff892ee86a47a73eaea13ec1e1fdc5914c5939dbf65f2c5bb888d708884e37326129f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ba02bf86e35b6ac9d487c79a28a6e72728536276ec54203a3917681d0f53094dd97a0719635f81cfadec7b6e887add2e70f293a736ec911807b97fbc0c22124f1ceeac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -472,11 +486,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe7ef5a54372a614d49b2268214f87bd300dc3054a23d6895d31d3672a498fe9c",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9e3274e9a97c7ae3422568dad4fd6250bc9dd8410ef2d49d23855aa1939f1b40",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f86dcf",
+                "balance" : "0x4563918244f79914",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -504,21 +518,23 @@
                 }
             },
             "0xa300000000000000000000000000000000000000" : {
-                "balance" : "0x00",
+                "balance" : "0x0a",
                 "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a0a227",
+                "balance" : "0xe8d4a176e2",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
-                "balance" : "0x0a",
+                "balance" : "0x00",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
@@ -612,10 +628,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g0v1_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d3g0v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g0v1Filler.json"
         },
         "blocks" : [
@@ -626,19 +642,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x038ec4",
-                    "hash" : "0xd9c1c57111fd1e7c0686557b4c800ab4e356d57e706e0622047d53f1b65de26c",
-                    "mixHash" : "0xba962b9780fd0bcdc7c2c6c07919a4348d0aed36e23b38a2ab61b9598fe2150a",
-                    "nonce" : "0xef86850867cea579",
+                    "gasUsed" : "0x039914",
+                    "hash" : "0xc3a20df300071125493dcb4ad152020a87df59c3087f57ae1cca90268a187863",
+                    "mixHash" : "0x285fc67f91b3a35c483c38bd70d75b7bd6aacadbb71a08a67552993224e1ce5e",
+                    "nonce" : "0x18367c9d14fcdfc5",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x6fee49ffd2e8d27adad425f7dbb0f22a00459248e3c0d4432c946440e11f43c8",
-                    "stateRoot" : "0x1ef5b4f912902ed7a9f5e6f8e324b92579b0779a7a37a25798660cb72a63207a",
+                    "receiptTrie" : "0x86c6c20d294c1127e9da3c3c8fd0bb1756ef72bdffc42bc941785ddfdfae65b7",
+                    "stateRoot" : "0x47001c4eb38e9ef7a2be5a14e4704958d833f8135eb26f7d8e8c464073e33548",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc1286a7ef6ef411d849ca4ca4bc9a87c6eec4dc5197d57b571246747fbd99125",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ef5b4f912902ed7a9f5e6f8e324b92579b0779a7a37a25798660cb72a63207aa0c1286a7ef6ef411d849ca4ca4bc9a87c6eec4dc5197d57b571246747fbd99125a06fee49ffd2e8d27adad425f7dbb0f22a00459248e3c0d4432c946440e11f43c8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083038ec48203e880a0ba962b9780fd0bcdc7c2c6c07919a4348d0aed36e23b38a2ab61b9598fe2150a88ef86850867cea579f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ba02bf86e35b6ac9d487c79a28a6e72728536276ec54203a3917681d0f53094dd97a0719635f81cfadec7b6e887add2e70f293a736ec911807b97fbc0c22124f1ceeac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa047001c4eb38e9ef7a2be5a14e4704958d833f8135eb26f7d8e8c464073e33548a0c1286a7ef6ef411d849ca4ca4bc9a87c6eec4dc5197d57b571246747fbd99125a086c6c20d294c1127e9da3c3c8fd0bb1756ef72bdffc42bc941785ddfdfae65b7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830399148203e880a0285fc67f91b3a35c483c38bd70d75b7bd6aacadbb71a08a67552993224e1ce5e8818367c9d14fcdfc5f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ba02bf86e35b6ac9d487c79a28a6e72728536276ec54203a3917681d0f53094dd97a0719635f81cfadec7b6e887add2e70f293a736ec911807b97fbc0c22124f1ceeac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -675,11 +691,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd9c1c57111fd1e7c0686557b4c800ab4e356d57e706e0622047d53f1b65de26c",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc3a20df300071125493dcb4ad152020a87df59c3087f57ae1cca90268a187863",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f78ec4",
+                "balance" : "0x4563918244f79914",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -716,7 +732,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a18132",
+                "balance" : "0xe8d4a176e2",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -817,10 +833,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g0v1_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d3g0v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g0v1Filler.json"
         },
         "blocks" : [
@@ -831,19 +847,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0239b1",
-                    "hash" : "0x0d7a81584b1d6ba26f1971337cf86484071d80e26c5cc349e4d8cf271b3b8cb9",
-                    "mixHash" : "0x7876f60891aa26992d8cffd4a672107427bc60ec420775bb8ac9dd2a837ca609",
-                    "nonce" : "0x7a5f438b5374d3d3",
+                    "gasUsed" : "0x046dcf",
+                    "hash" : "0xcae95ee1932e6cde43581ca5c74b086cbae1d1f1e813eb40ac6c2de2419f7edb",
+                    "mixHash" : "0x548b0313a4cf135b867f5d45fb414039489111a19051bb2b23d2a505d4d7d518",
+                    "nonce" : "0x92499b6b7e53f20a",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x0dbafe61adf97a116d70e0ff51248faa1c5eb43b68b1192ed798d9c14e847c3f",
-                    "stateRoot" : "0x0d59e1e847c80f9897465234c5e98375d4f64060af57ffef427880b340c2a17e",
+                    "receiptTrie" : "0x21d1cbb68c10b642696984267d5e668daba80dda5858b3079549027e0db5cca9",
+                    "stateRoot" : "0x053ba5fc619833abbc2c2ad4f33ace4e843ef499927baee5e628bb2ee54f289e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc1286a7ef6ef411d849ca4ca4bc9a87c6eec4dc5197d57b571246747fbd99125",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00d59e1e847c80f9897465234c5e98375d4f64060af57ffef427880b340c2a17ea0c1286a7ef6ef411d849ca4ca4bc9a87c6eec4dc5197d57b571246747fbd99125a00dbafe61adf97a116d70e0ff51248faa1c5eb43b68b1192ed798d9c14e847c3fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239b18203e880a07876f60891aa26992d8cffd4a672107427bc60ec420775bb8ac9dd2a837ca609887a5f438b5374d3d3f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ba02bf86e35b6ac9d487c79a28a6e72728536276ec54203a3917681d0f53094dd97a0719635f81cfadec7b6e887add2e70f293a736ec911807b97fbc0c22124f1ceeac0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0053ba5fc619833abbc2c2ad4f33ace4e843ef499927baee5e628bb2ee54f289ea0c1286a7ef6ef411d849ca4ca4bc9a87c6eec4dc5197d57b571246747fbd99125a021d1cbb68c10b642696984267d5e668daba80dda5858b3079549027e0db5cca9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083046dcf8203e880a0548b0313a4cf135b867f5d45fb414039489111a19051bb2b23d2a505d4d7d5188892499b6b7e53f20af882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ba02bf86e35b6ac9d487c79a28a6e72728536276ec54203a3917681d0f53094dd97a0719635f81cfadec7b6e887add2e70f293a736ec911807b97fbc0c22124f1ceeac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -880,18 +896,214 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0d7a81584b1d6ba26f1971337cf86484071d80e26c5cc349e4d8cf271b3b8cb9",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xcae95ee1932e6cde43581ca5c74b086cbae1d1f1e813eb40ac6c2de2419f7edb",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f86dcf",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a0a227",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x0a",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d3g0v1_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g0v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x038ec4",
+                    "hash" : "0xf30210ab1cbda1e800a889ae3aefc0e918ac3ffdf9209380c5651ad08bfeb260",
+                    "mixHash" : "0xb9f9620e291b42c101601b2c1c20e4575a270076e2e64a092a5b620e89983725",
+                    "nonce" : "0x472f16970331cc26",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0x6fee49ffd2e8d27adad425f7dbb0f22a00459248e3c0d4432c946440e11f43c8",
+                    "stateRoot" : "0x1ef5b4f912902ed7a9f5e6f8e324b92579b0779a7a37a25798660cb72a63207a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc1286a7ef6ef411d849ca4ca4bc9a87c6eec4dc5197d57b571246747fbd99125",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ef5b4f912902ed7a9f5e6f8e324b92579b0779a7a37a25798660cb72a63207aa0c1286a7ef6ef411d849ca4ca4bc9a87c6eec4dc5197d57b571246747fbd99125a06fee49ffd2e8d27adad425f7dbb0f22a00459248e3c0d4432c946440e11f43c8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083038ec48203e880a0b9f9620e291b42c101601b2c1c20e4575a270076e2e64a092a5b620e8998372588472f16970331cc26f882f8808001830c350094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ba02bf86e35b6ac9d487c79a28a6e72728536276ec54203a3917681d0f53094dd97a0719635f81cfadec7b6e887add2e70f293a736ec911807b97fbc0c22124f1ceeac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
+                        "gasLimit" : "0x0c3500",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2bf86e35b6ac9d487c79a28a6e72728536276ec54203a3917681d0f53094dd97",
+                        "s" : "0x719635f81cfadec7b6e887add2e70f293a736ec911807b97fbc0c22124f1ceea",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf30210ab1cbda1e800a889ae3aefc0e918ac3ffdf9209380c5651ad08bfeb260",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f639b1",
+                "balance" : "0x4563918244f78ec4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -928,7 +1140,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2d645",
+                "balance" : "0xe8d4a18132",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g1v0.json
index 288144f84..27207c147 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d3g1v0_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d3g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x021bab",
-                    "hash" : "0xd316b9717473ee95eacaf8e03683e25d1e7879273fac426487c63dcaef6ad2b4",
-                    "mixHash" : "0x5940655d6e71b89d1ea921195052f404a427fc5349abe4e9d4d09c99cc85230b",
-                    "nonce" : "0x4b31137fe2357957",
+                    "hash" : "0xa27f5477d1f97b5cdbeb7e6392a92642e8fef7b678aeccdaa42f88efb9d19710",
+                    "mixHash" : "0x0f3c08b8e887a4593da028d96a3653e491c7a527c421b5f1aa5565ff29a468ec",
+                    "nonce" : "0x89962c34dfcce80d",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248",
-                    "stateRoot" : "0xa27bd406ba7bfcfa53658aeb61745209354cfd1bf2e7b109f3d0e505239cf53d",
+                    "receiptTrie" : "0x53676617105e409ad2fa2ca6c10cff34c7e103bb501f2af60fd65b5311754d2c",
+                    "stateRoot" : "0x8964f2826c5f39086e6c7bde2870c0c9ceb501008c4794d50dcea2e485ec7013",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdfe2fae3c54fb191d53b21aecdc304ba8120ad27bcec9dd68b2536757b592126",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a27bd406ba7bfcfa53658aeb61745209354cfd1bf2e7b109f3d0e505239cf53da0dfe2fae3c54fb191d53b21aecdc304ba8120ad27bcec9dd68b2536757b592126a0974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a05940655d6e71b89d1ea921195052f404a427fc5349abe4e9d4d09c99cc85230b884b31137fe2357957f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba02438d13c0dcafeb212e66b4964c83d5b99b47e1db980aacbe7810fc808c4eb05a052bf8754b9b2dd0942a32984b1142d9541b740556f12dbce8a50982e96e1ea29c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08964f2826c5f39086e6c7bde2870c0c9ceb501008c4794d50dcea2e485ec7013a0dfe2fae3c54fb191d53b21aecdc304ba8120ad27bcec9dd68b2536757b592126a053676617105e409ad2fa2ca6c10cff34c7e103bb501f2af60fd65b5311754d2cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a00f3c08b8e887a4593da028d96a3653e491c7a527c421b5f1aa5565ff29a468ec8889962c34dfcce80df882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba02438d13c0dcafeb212e66b4964c83d5b99b47e1db980aacbe7810fc808c4eb05a052bf8754b9b2dd0942a32984b1142d9541b740556f12dbce8a50982e96e1ea29c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd316b9717473ee95eacaf8e03683e25d1e7879273fac426487c63dcaef6ad2b4",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa27f5477d1f97b5cdbeb7e6392a92642e8fef7b678aeccdaa42f88efb9d19710",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f61bab",
                 "code" : "",
@@ -202,10 +209,220 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g1v0_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d3g1v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x021bab",
+                    "hash" : "0x3b29e17b43ce3f85c8720d9fef6b273bff39eb0f4176d89f033de54b92425c2f",
+                    "mixHash" : "0xf913eb2438438573d8ac41b642b2e42b6f327924afd52cc1c0f0d05b24024922",
+                    "nonce" : "0xc72a72a92b1b33a8",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0x53676617105e409ad2fa2ca6c10cff34c7e103bb501f2af60fd65b5311754d2c",
+                    "stateRoot" : "0x8964f2826c5f39086e6c7bde2870c0c9ceb501008c4794d50dcea2e485ec7013",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xdfe2fae3c54fb191d53b21aecdc304ba8120ad27bcec9dd68b2536757b592126",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08964f2826c5f39086e6c7bde2870c0c9ceb501008c4794d50dcea2e485ec7013a0dfe2fae3c54fb191d53b21aecdc304ba8120ad27bcec9dd68b2536757b592126a053676617105e409ad2fa2ca6c10cff34c7e103bb501f2af60fd65b5311754d2cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a0f913eb2438438573d8ac41b642b2e42b6f327924afd52cc1c0f0d05b2402492288c72a72a92b1b33a8f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba02438d13c0dcafeb212e66b4964c83d5b99b47e1db980aacbe7810fc808c4eb05a052bf8754b9b2dd0942a32984b1142d9541b740556f12dbce8a50982e96e1ea29c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
+                        "gasLimit" : "0x0222e0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2438d13c0dcafeb212e66b4964c83d5b99b47e1db980aacbe7810fc808c4eb05",
+                        "s" : "0x52bf8754b9b2dd0942a32984b1142d9541b740556f12dbce8a50982e96e1ea29",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3b29e17b43ce3f85c8720d9fef6b273bff39eb0f4176d89f033de54b92425c2f",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f61bab",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2f455",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d3g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g1v0Filler.json"
         },
         "blocks" : [
@@ -217,9 +434,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x021bab",
-                    "hash" : "0x16481f5142d70f15a130af578e7a0352cbedf81e8b106f35c11cdf742fe891e2",
-                    "mixHash" : "0x00dc991ef9a49f26d8277ffb7e51829fd3750a65589349910d1a0d4ffa26e232",
-                    "nonce" : "0x91372e3c6058e53d",
+                    "hash" : "0x80b6580aecfc4f71cac96475cdb99e58cd5b850d0e8d649c17189c1a3f0cc645",
+                    "mixHash" : "0xa90bb0f2fbf1ca9016c78d36ccc9c792ff7c266daaa38848233211e17b04ba2d",
+                    "nonce" : "0x3cbfc51011e3e53c",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248",
@@ -228,7 +445,7 @@
                     "transactionsTrie" : "0xdfe2fae3c54fb191d53b21aecdc304ba8120ad27bcec9dd68b2536757b592126",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a27bd406ba7bfcfa53658aeb61745209354cfd1bf2e7b109f3d0e505239cf53da0dfe2fae3c54fb191d53b21aecdc304ba8120ad27bcec9dd68b2536757b592126a0974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a000dc991ef9a49f26d8277ffb7e51829fd3750a65589349910d1a0d4ffa26e2328891372e3c6058e53df882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba02438d13c0dcafeb212e66b4964c83d5b99b47e1db980aacbe7810fc808c4eb05a052bf8754b9b2dd0942a32984b1142d9541b740556f12dbce8a50982e96e1ea29c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a27bd406ba7bfcfa53658aeb61745209354cfd1bf2e7b109f3d0e505239cf53da0dfe2fae3c54fb191d53b21aecdc304ba8120ad27bcec9dd68b2536757b592126a0974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a0a90bb0f2fbf1ca9016c78d36ccc9c792ff7c266daaa38848233211e17b04ba2d883cbfc51011e3e53cf882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba02438d13c0dcafeb212e66b4964c83d5b99b47e1db980aacbe7810fc808c4eb05a052bf8754b9b2dd0942a32984b1142d9541b740556f12dbce8a50982e96e1ea29c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -265,8 +482,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x16481f5142d70f15a130af578e7a0352cbedf81e8b106f35c11cdf742fe891e2",
-        "network" : "EIP158",
+        "lastblockhash" : "0x80b6580aecfc4f71cac96475cdb99e58cd5b850d0e8d649c17189c1a3f0cc645",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f61bab",
@@ -405,10 +622,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g1v0_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d3g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g1v0Filler.json"
         },
         "blocks" : [
@@ -419,19 +636,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0222e0",
-                    "hash" : "0xf42285fa1b352c7ca5c66f111174d21b70553e8ef950a5053dd7ba42d8b396c6",
-                    "mixHash" : "0x5a6f8ed76be7ebe55e58619a7352f6e0e8e5d332131daeb88e920a64af253b39",
-                    "nonce" : "0xee8d9fb0e052a016",
+                    "gasUsed" : "0x021bab",
+                    "hash" : "0x903385b9858f7977029f59b347989a5d745916756b9209ec16923c8f397b1f3e",
+                    "mixHash" : "0x8d63bdd09b200e2de5adceba5dd8c33c30ff437883cbe6a5d79de05c976fccd1",
+                    "nonce" : "0xba72163d0f3d5206",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x4127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705",
-                    "stateRoot" : "0x4a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474c",
+                    "receiptTrie" : "0x974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248",
+                    "stateRoot" : "0xa27bd406ba7bfcfa53658aeb61745209354cfd1bf2e7b109f3d0e505239cf53d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdfe2fae3c54fb191d53b21aecdc304ba8120ad27bcec9dd68b2536757b592126",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca0dfe2fae3c54fb191d53b21aecdc304ba8120ad27bcec9dd68b2536757b592126a04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a05a6f8ed76be7ebe55e58619a7352f6e0e8e5d332131daeb88e920a64af253b3988ee8d9fb0e052a016f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba02438d13c0dcafeb212e66b4964c83d5b99b47e1db980aacbe7810fc808c4eb05a052bf8754b9b2dd0942a32984b1142d9541b740556f12dbce8a50982e96e1ea29c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a27bd406ba7bfcfa53658aeb61745209354cfd1bf2e7b109f3d0e505239cf53da0dfe2fae3c54fb191d53b21aecdc304ba8120ad27bcec9dd68b2536757b592126a0974dc111f0709286ebaa9ce7780fb06d051d22cb9d93a7091629185f21674248b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a08d63bdd09b200e2de5adceba5dd8c33c30ff437883cbe6a5d79de05c976fccd188ba72163d0f3d5206f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba02438d13c0dcafeb212e66b4964c83d5b99b47e1db980aacbe7810fc808c4eb05a052bf8754b9b2dd0942a32984b1142d9541b740556f12dbce8a50982e96e1ea29c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -468,11 +685,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf42285fa1b352c7ca5c66f111174d21b70553e8ef950a5053dd7ba42d8b396c6",
-        "network" : "Frontier",
+        "lastblockhash" : "0x903385b9858f7977029f59b347989a5d745916756b9209ec16923c8f397b1f3e",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f622e0",
+                "balance" : "0x4563918244f61bab",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,7 +724,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2ed20",
+                "balance" : "0xe8d4a2f455",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -608,10 +825,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g1v0_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d3g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g1v0Filler.json"
         },
         "blocks" : [
@@ -623,9 +840,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0222e0",
-                    "hash" : "0xa9c115feb7c5371b9b5521daa64dc7c9479d5e4e05f7c75f4a5fdd4fdbf665e7",
-                    "mixHash" : "0x7edf9366503f8b3a99457d41d4d1f815a09c65eb2896de98ca221abf02208f8b",
-                    "nonce" : "0x44219350116f8472",
+                    "hash" : "0xd1eb3b5d754b7248ce29de4cf71489c722373676fc28441034fd8e0f6c7bc41b",
+                    "mixHash" : "0xaa9bc48a2ac0d2a31b55e571831c7e9139efc1da0e434ed61996a893cddf7777",
+                    "nonce" : "0x864e055b7679a731",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x4127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705",
@@ -634,7 +851,7 @@
                     "transactionsTrie" : "0xdfe2fae3c54fb191d53b21aecdc304ba8120ad27bcec9dd68b2536757b592126",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca0dfe2fae3c54fb191d53b21aecdc304ba8120ad27bcec9dd68b2536757b592126a04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a07edf9366503f8b3a99457d41d4d1f815a09c65eb2896de98ca221abf02208f8b8844219350116f8472f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba02438d13c0dcafeb212e66b4964c83d5b99b47e1db980aacbe7810fc808c4eb05a052bf8754b9b2dd0942a32984b1142d9541b740556f12dbce8a50982e96e1ea29c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca0dfe2fae3c54fb191d53b21aecdc304ba8120ad27bcec9dd68b2536757b592126a04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a0aa9bc48a2ac0d2a31b55e571831c7e9139efc1da0e434ed61996a893cddf777788864e055b7679a731f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba02438d13c0dcafeb212e66b4964c83d5b99b47e1db980aacbe7810fc808c4eb05a052bf8754b9b2dd0942a32984b1142d9541b740556f12dbce8a50982e96e1ea29c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -671,8 +888,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa9c115feb7c5371b9b5521daa64dc7c9479d5e4e05f7c75f4a5fdd4fdbf665e7",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd1eb3b5d754b7248ce29de4cf71489c722373676fc28441034fd8e0f6c7bc41b",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f622e0",
@@ -811,10 +1028,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g1v0_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d3g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g1v0Filler.json"
         },
         "blocks" : [
@@ -825,19 +1042,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x021bab",
-                    "hash" : "0x397f06095feff56eb02d7fdec345a26251ad1dba3311e59fc8d548444c76cc04",
-                    "mixHash" : "0x77c9e91fd058c0a510559c1406ac2845ff525a6bec3958510233d434a57d2139",
-                    "nonce" : "0x3a9303095017ad8c",
+                    "gasUsed" : "0x0222e0",
+                    "hash" : "0xf757e7ec117a81b60b47c7ba09006509326ee5731f91182c075404133c3e01f7",
+                    "mixHash" : "0xdf36949ee61c462bc61dad3b02de7750705252087e0f8c59727f257117b8f573",
+                    "nonce" : "0xd00c850d4023cd00",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x53676617105e409ad2fa2ca6c10cff34c7e103bb501f2af60fd65b5311754d2c",
-                    "stateRoot" : "0x8964f2826c5f39086e6c7bde2870c0c9ceb501008c4794d50dcea2e485ec7013",
+                    "receiptTrie" : "0x4127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705",
+                    "stateRoot" : "0x4a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdfe2fae3c54fb191d53b21aecdc304ba8120ad27bcec9dd68b2536757b592126",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08964f2826c5f39086e6c7bde2870c0c9ceb501008c4794d50dcea2e485ec7013a0dfe2fae3c54fb191d53b21aecdc304ba8120ad27bcec9dd68b2536757b592126a053676617105e409ad2fa2ca6c10cff34c7e103bb501f2af60fd65b5311754d2cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021bab8203e880a077c9e91fd058c0a510559c1406ac2845ff525a6bec3958510233d434a57d2139883a9303095017ad8cf882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba02438d13c0dcafeb212e66b4964c83d5b99b47e1db980aacbe7810fc808c4eb05a052bf8754b9b2dd0942a32984b1142d9541b740556f12dbce8a50982e96e1ea29c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca0dfe2fae3c54fb191d53b21aecdc304ba8120ad27bcec9dd68b2536757b592126a04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a0df36949ee61c462bc61dad3b02de7750705252087e0f8c59727f257117b8f57388d00c850d4023cd00f882f8808001830222e094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba02438d13c0dcafeb212e66b4964c83d5b99b47e1db980aacbe7810fc808c4eb05a052bf8754b9b2dd0942a32984b1142d9541b740556f12dbce8a50982e96e1ea29c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -874,18 +1091,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x397f06095feff56eb02d7fdec345a26251ad1dba3311e59fc8d548444c76cc04",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xf757e7ec117a81b60b47c7ba09006509326ee5731f91182c075404133c3e01f7",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f61bab",
+                "balance" : "0x4563918244f622e0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -920,7 +1130,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2f455",
+                "balance" : "0xe8d4a2ed20",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g1v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g1v1.json
index 0f31e4d5e..88ac9cb7e 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g1v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g1v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d3g1v1_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d3g1v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g1v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x021c38",
-                    "hash" : "0xfd745f8eed66b894635ebd4797b724dd526684ffe6697f3852bf15a3a3c0afbb",
-                    "mixHash" : "0xf831644418dc8ebf3d7742a8a29b6806b8c4edfcde97ebcc0a46c52e251ef1ca",
-                    "nonce" : "0xb551cc583b524310",
+                    "hash" : "0xf8b00a59306a1550eb11d698282b50794d17fd022d4168bad80c8721fdcdebf5",
+                    "mixHash" : "0xb8ffc936c7dd5b22e79610d4263547ea210d6c7049b32a27a340fa34aa462a08",
+                    "nonce" : "0x5b0d77adbe0d4791",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x4569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347",
-                    "stateRoot" : "0x3c1d230a551485cf88053ae87b45605c9aef43f470d13df126fe6ae8beb5fcb0",
+                    "receiptTrie" : "0x24d2d186ab09293dbc34b96a81c4c5b17ca8ffcaf089fac761837eb4295292ce",
+                    "stateRoot" : "0xce4e66c72c075a0f93843f269406dbe35dcdcc3f047d9739dc77ad2e3500bbfe",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2a6dbb7842440a5f8bea135584224ea4ee323e2d25a3004259f478afeb824944",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c1d230a551485cf88053ae87b45605c9aef43f470d13df126fe6ae8beb5fcb0a02a6dbb7842440a5f8bea135584224ea4ee323e2d25a3004259f478afeb824944a04569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a0f831644418dc8ebf3d7742a8a29b6806b8c4edfcde97ebcc0a46c52e251ef1ca88b551cc583b524310f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca02f4606d8f9d177366909a187c70438ddb0160cbba3ccef2a89b02d7b323e432aa05880bfb99d1349ca226f1de176f2c0af8ecdf0b24f3bddbea31e001fdd6a3ed8c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ce4e66c72c075a0f93843f269406dbe35dcdcc3f047d9739dc77ad2e3500bbfea02a6dbb7842440a5f8bea135584224ea4ee323e2d25a3004259f478afeb824944a024d2d186ab09293dbc34b96a81c4c5b17ca8ffcaf089fac761837eb4295292ceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a0b8ffc936c7dd5b22e79610d4263547ea210d6c7049b32a27a340fa34aa462a08885b0d77adbe0d4791f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca02f4606d8f9d177366909a187c70438ddb0160cbba3ccef2a89b02d7b323e432aa05880bfb99d1349ca226f1de176f2c0af8ecdf0b24f3bddbea31e001fdd6a3ed8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfd745f8eed66b894635ebd4797b724dd526684ffe6697f3852bf15a3a3c0afbb",
-        "network" : "EIP150",
+        "lastblockhash" : "0xf8b00a59306a1550eb11d698282b50794d17fd022d4168bad80c8721fdcdebf5",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f61c38",
                 "code" : "",
@@ -202,10 +209,220 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g1v1_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d3g1v1_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g1v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x021c38",
+                    "hash" : "0x7c5754fa959b16fbbde5a8e0de972c6056f79da287671b3e95ab79a878191be3",
+                    "mixHash" : "0x9bfe9857a46de8f7fee4621b441f5a9f4448a9f7ecbf731f70233bf0114c4f66",
+                    "nonce" : "0x9e69ff588249ec50",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0x24d2d186ab09293dbc34b96a81c4c5b17ca8ffcaf089fac761837eb4295292ce",
+                    "stateRoot" : "0xce4e66c72c075a0f93843f269406dbe35dcdcc3f047d9739dc77ad2e3500bbfe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2a6dbb7842440a5f8bea135584224ea4ee323e2d25a3004259f478afeb824944",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ce4e66c72c075a0f93843f269406dbe35dcdcc3f047d9739dc77ad2e3500bbfea02a6dbb7842440a5f8bea135584224ea4ee323e2d25a3004259f478afeb824944a024d2d186ab09293dbc34b96a81c4c5b17ca8ffcaf089fac761837eb4295292ceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a09bfe9857a46de8f7fee4621b441f5a9f4448a9f7ecbf731f70233bf0114c4f66889e69ff588249ec50f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca02f4606d8f9d177366909a187c70438ddb0160cbba3ccef2a89b02d7b323e432aa05880bfb99d1349ca226f1de176f2c0af8ecdf0b24f3bddbea31e001fdd6a3ed8c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
+                        "gasLimit" : "0x0222e0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2f4606d8f9d177366909a187c70438ddb0160cbba3ccef2a89b02d7b323e432a",
+                        "s" : "0x5880bfb99d1349ca226f1de176f2c0af8ecdf0b24f3bddbea31e001fdd6a3ed8",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7c5754fa959b16fbbde5a8e0de972c6056f79da287671b3e95ab79a878191be3",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f61c38",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2f3be",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x0a",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d3g1v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g1v1Filler.json"
         },
         "blocks" : [
@@ -217,9 +434,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x021c38",
-                    "hash" : "0xf18569a8d83a05434f33be480d8b3d11df164b525ae6e397ab33137c37dfa9cf",
-                    "mixHash" : "0x30f3ecf535fd9b74607eaf5e9ed2a3f44db508772bf8c83c95c66aa93fe25234",
-                    "nonce" : "0x22f7f67b7f8f45b2",
+                    "hash" : "0xeab5604fc57c2e08b99f9cdfc2dd167f80ba69b9ea91f7cef6e9c5fb0cdafa91",
+                    "mixHash" : "0xe5afb4cc5fe455b85038499f1a08f678a61644ea61ea96314f313a5f9fa977ca",
+                    "nonce" : "0x47e560e62dd4628c",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x4569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347",
@@ -228,7 +445,7 @@
                     "transactionsTrie" : "0x2a6dbb7842440a5f8bea135584224ea4ee323e2d25a3004259f478afeb824944",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c1d230a551485cf88053ae87b45605c9aef43f470d13df126fe6ae8beb5fcb0a02a6dbb7842440a5f8bea135584224ea4ee323e2d25a3004259f478afeb824944a04569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a030f3ecf535fd9b74607eaf5e9ed2a3f44db508772bf8c83c95c66aa93fe252348822f7f67b7f8f45b2f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca02f4606d8f9d177366909a187c70438ddb0160cbba3ccef2a89b02d7b323e432aa05880bfb99d1349ca226f1de176f2c0af8ecdf0b24f3bddbea31e001fdd6a3ed8c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c1d230a551485cf88053ae87b45605c9aef43f470d13df126fe6ae8beb5fcb0a02a6dbb7842440a5f8bea135584224ea4ee323e2d25a3004259f478afeb824944a04569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a0e5afb4cc5fe455b85038499f1a08f678a61644ea61ea96314f313a5f9fa977ca8847e560e62dd4628cf882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca02f4606d8f9d177366909a187c70438ddb0160cbba3ccef2a89b02d7b323e432aa05880bfb99d1349ca226f1de176f2c0af8ecdf0b24f3bddbea31e001fdd6a3ed8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -265,8 +482,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf18569a8d83a05434f33be480d8b3d11df164b525ae6e397ab33137c37dfa9cf",
-        "network" : "EIP158",
+        "lastblockhash" : "0xeab5604fc57c2e08b99f9cdfc2dd167f80ba69b9ea91f7cef6e9c5fb0cdafa91",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f61c38",
@@ -405,10 +622,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g1v1_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d3g1v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g1v1Filler.json"
         },
         "blocks" : [
@@ -419,19 +636,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0222e0",
-                    "hash" : "0x83f70712db57a73ef5b207263e4c095a4a4364d7546c53bd89532d9155dcb79b",
-                    "mixHash" : "0xda4f831e88aea152a13c3f49e76a051e5e611c61d7bfa0a4eb2960724a4106dd",
-                    "nonce" : "0x637611a4b15e3bf5",
+                    "gasUsed" : "0x021c38",
+                    "hash" : "0xe73fb233f0c6d92ac58be50380c8ef7970b8be3e2528f37842a0722913d9740c",
+                    "mixHash" : "0x9637a4024d0321fe80a1e52c184011c4af5e19965e767eda3e818cd41e3f5635",
+                    "nonce" : "0x01499ae774cb1666",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x4127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705",
-                    "stateRoot" : "0x4a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474c",
+                    "receiptTrie" : "0x4569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347",
+                    "stateRoot" : "0x3c1d230a551485cf88053ae87b45605c9aef43f470d13df126fe6ae8beb5fcb0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2a6dbb7842440a5f8bea135584224ea4ee323e2d25a3004259f478afeb824944",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca02a6dbb7842440a5f8bea135584224ea4ee323e2d25a3004259f478afeb824944a04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a0da4f831e88aea152a13c3f49e76a051e5e611c61d7bfa0a4eb2960724a4106dd88637611a4b15e3bf5f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca02f4606d8f9d177366909a187c70438ddb0160cbba3ccef2a89b02d7b323e432aa05880bfb99d1349ca226f1de176f2c0af8ecdf0b24f3bddbea31e001fdd6a3ed8c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c1d230a551485cf88053ae87b45605c9aef43f470d13df126fe6ae8beb5fcb0a02a6dbb7842440a5f8bea135584224ea4ee323e2d25a3004259f478afeb824944a04569f85c96e6d2b4854f54e44f3b884cf3568c7b287f0bc699e936a215fec347b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a09637a4024d0321fe80a1e52c184011c4af5e19965e767eda3e818cd41e3f56358801499ae774cb1666f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca02f4606d8f9d177366909a187c70438ddb0160cbba3ccef2a89b02d7b323e432aa05880bfb99d1349ca226f1de176f2c0af8ecdf0b24f3bddbea31e001fdd6a3ed8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -468,11 +685,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x83f70712db57a73ef5b207263e4c095a4a4364d7546c53bd89532d9155dcb79b",
-        "network" : "Frontier",
+        "lastblockhash" : "0xe73fb233f0c6d92ac58be50380c8ef7970b8be3e2528f37842a0722913d9740c",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f622e0",
+                "balance" : "0x4563918244f61c38",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,14 +724,14 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2ed20",
+                "balance" : "0xe8d4a2f3be",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
-                "balance" : "0x00",
+                "balance" : "0x0a",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
@@ -608,10 +825,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g1v1_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d3g1v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g1v1Filler.json"
         },
         "blocks" : [
@@ -623,9 +840,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0222e0",
-                    "hash" : "0x5a9c3bd460f28ccdb55700041ff16fc90476af65c2664940f1d75acdcc418dfd",
-                    "mixHash" : "0x7e4e57eb588861ef15b05ef3df33271df47d223bf71caffe36959d888961e959",
-                    "nonce" : "0xedf5eccb2339433d",
+                    "hash" : "0xd9fc0c94792fc1f78dd9edcedcbaeedfcfbe464b38f9367e91f45047c023b4bf",
+                    "mixHash" : "0x7d0f7d0b7e5c1e17041becc31622ed0c70ce4c2f17af6f5a945bca97aed88039",
+                    "nonce" : "0xfd9afa8236bd8f6e",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x4127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705",
@@ -634,7 +851,7 @@
                     "transactionsTrie" : "0x2a6dbb7842440a5f8bea135584224ea4ee323e2d25a3004259f478afeb824944",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca02a6dbb7842440a5f8bea135584224ea4ee323e2d25a3004259f478afeb824944a04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a07e4e57eb588861ef15b05ef3df33271df47d223bf71caffe36959d888961e95988edf5eccb2339433df882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca02f4606d8f9d177366909a187c70438ddb0160cbba3ccef2a89b02d7b323e432aa05880bfb99d1349ca226f1de176f2c0af8ecdf0b24f3bddbea31e001fdd6a3ed8c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca02a6dbb7842440a5f8bea135584224ea4ee323e2d25a3004259f478afeb824944a04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a07d0f7d0b7e5c1e17041becc31622ed0c70ce4c2f17af6f5a945bca97aed8803988fd9afa8236bd8f6ef882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca02f4606d8f9d177366909a187c70438ddb0160cbba3ccef2a89b02d7b323e432aa05880bfb99d1349ca226f1de176f2c0af8ecdf0b24f3bddbea31e001fdd6a3ed8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -671,8 +888,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5a9c3bd460f28ccdb55700041ff16fc90476af65c2664940f1d75acdcc418dfd",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd9fc0c94792fc1f78dd9edcedcbaeedfcfbe464b38f9367e91f45047c023b4bf",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f622e0",
@@ -811,10 +1028,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g1v1_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d3g1v1_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g1v1Filler.json"
         },
         "blocks" : [
@@ -825,19 +1042,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x021c38",
-                    "hash" : "0xde656355c7cddbea93e53664173bfdd34de15df103fd14cb9a2e90780772fc55",
-                    "mixHash" : "0x575b8ac9033061a5728159505e2eb7b4426f6cdbef815b393ee551bee645231f",
-                    "nonce" : "0x73208ceac4389c91",
+                    "gasUsed" : "0x0222e0",
+                    "hash" : "0xcefbc8a810a35d7e6ddec9f5801532a2e7d97cf2ec417bf04399d1b668311812",
+                    "mixHash" : "0xf2003a91319e3b3c4914c11f9bce2431e9b17b1066172576b210e5a1c8b67cb9",
+                    "nonce" : "0x8e575837cd395fe1",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x24d2d186ab09293dbc34b96a81c4c5b17ca8ffcaf089fac761837eb4295292ce",
-                    "stateRoot" : "0xce4e66c72c075a0f93843f269406dbe35dcdcc3f047d9739dc77ad2e3500bbfe",
+                    "receiptTrie" : "0x4127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705",
+                    "stateRoot" : "0x4a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2a6dbb7842440a5f8bea135584224ea4ee323e2d25a3004259f478afeb824944",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ce4e66c72c075a0f93843f269406dbe35dcdcc3f047d9739dc77ad2e3500bbfea02a6dbb7842440a5f8bea135584224ea4ee323e2d25a3004259f478afeb824944a024d2d186ab09293dbc34b96a81c4c5b17ca8ffcaf089fac761837eb4295292ceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021c388203e880a0575b8ac9033061a5728159505e2eb7b4426f6cdbef815b393ee551bee645231f8873208ceac4389c91f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca02f4606d8f9d177366909a187c70438ddb0160cbba3ccef2a89b02d7b323e432aa05880bfb99d1349ca226f1de176f2c0af8ecdf0b24f3bddbea31e001fdd6a3ed8c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a48398066dcc072f1da0a2c9f85e4265eab9b7e154345e1d2d15eb8dd4e474ca02a6dbb7842440a5f8bea135584224ea4ee323e2d25a3004259f478afeb824944a04127fb2a6ca28c86b2cc2dffc01a08a3c3ef7577337f7c461282d66a9759b705b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830222e08203e880a0f2003a91319e3b3c4914c11f9bce2431e9b17b1066172576b210e5a1c8b67cb9888e575837cd395fe1f882f8808001830222e094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca02f4606d8f9d177366909a187c70438ddb0160cbba3ccef2a89b02d7b323e432aa05880bfb99d1349ca226f1de176f2c0af8ecdf0b24f3bddbea31e001fdd6a3ed8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -874,18 +1091,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xde656355c7cddbea93e53664173bfdd34de15df103fd14cb9a2e90780772fc55",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xcefbc8a810a35d7e6ddec9f5801532a2e7d97cf2ec417bf04399d1b668311812",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f61c38",
+                "balance" : "0x4563918244f622e0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -920,14 +1130,14 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2f3be",
+                "balance" : "0xe8d4a2ed20",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
-                "balance" : "0x0a",
+                "balance" : "0x00",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g2v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g2v0.json
index ec7c7600d..2712d4c47 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g2v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d3g2v0_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d3g2v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g2v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x026893",
-                    "hash" : "0xe57e25860fbb11b573a11cf3dd404a19fc5b9ee09d083db4a5f2db8b8418b4ca",
-                    "mixHash" : "0x25a08734c75470e2cee50e87f829b1c3c99f5f44ffb98f50a0d42b4e5cf4b47d",
-                    "nonce" : "0x8c146dd1c23d049c",
+                    "gasUsed" : "0x021f85",
+                    "hash" : "0xf500c8d2b684e90af0bff4b8ac438d57b225f6031a5783b0b0dc44557ba92979",
+                    "mixHash" : "0x3dde9bf1d9c27a561af809abfc26a7e02d09841f7adf1bd38d6f954f47f43bd5",
+                    "nonce" : "0x0c88333115b8dfce",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xfaa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bc",
-                    "stateRoot" : "0x1c7205499c9374238b01f9165469bffa499f1e737f29ea24b7db2a6602e0618b",
+                    "receiptTrie" : "0x611f34cecb2d24d9e78b3d85cbe275f8b294b60de4354b48063d5fa6c10f3b35",
+                    "stateRoot" : "0xd337a751454f600ba1d646f0bb0af2198d3a98322d58a743dacc73b245eac3b8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe2a4afeba94cb9b9dee5a1b949908bf81c02b7d1c8630b813088b678aa5b6b34",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c7205499c9374238b01f9165469bffa499f1e737f29ea24b7db2a6602e0618ba0e2a4afeba94cb9b9dee5a1b949908bf81c02b7d1c8630b813088b678aa5b6b34a0faa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bcb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830268938203e880a025a08734c75470e2cee50e87f829b1c3c99f5f44ffb98f50a0d42b4e5cf4b47d888c146dd1c23d049cf882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ca0ddbf3febd30b84a846ac82c7bdfb47755ffd0f6c51c7f319d02d4d3fa697cdbaa00d5191f44772f0c8b374d7712d218e01738bb78de2aef96ce841f36885ee3161c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d337a751454f600ba1d646f0bb0af2198d3a98322d58a743dacc73b245eac3b8a0e2a4afeba94cb9b9dee5a1b949908bf81c02b7d1c8630b813088b678aa5b6b34a0611f34cecb2d24d9e78b3d85cbe275f8b294b60de4354b48063d5fa6c10f3b35b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021f858203e880a03dde9bf1d9c27a561af809abfc26a7e02d09841f7adf1bd38d6f954f47f43bd5880c88333115b8dfcef882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ca0ddbf3febd30b84a846ac82c7bdfb47755ffd0f6c51c7f319d02d4d3fa697cdbaa00d5191f44772f0c8b374d7712d218e01738bb78de2aef96ce841f36885ee3161c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe57e25860fbb11b573a11cf3dd404a19fc5b9ee09d083db4a5f2db8b8418b4ca",
-        "network" : "EIP150",
+        "lastblockhash" : "0xf500c8d2b684e90af0bff4b8ac438d57b225f6031a5783b0b0dc44557ba92979",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f66893",
+                "balance" : "0x4563918244f61f85",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -98,10 +105,12 @@
                 "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2a76d",
+                "balance" : "0xe8d4a2f07b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -202,10 +211,222 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g2v0_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d3g2v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g2v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x021f85",
+                    "hash" : "0x33942f1fc38ec5b2224dc75e14c48f0c34eb6b2009b121b83fcc0adcb1169123",
+                    "mixHash" : "0x6e9a10bb0ac65a50126fcb8c5ec73160a2f48c35715ec8543059bca2dc774cc7",
+                    "nonce" : "0xf87951042e1c4091",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0x611f34cecb2d24d9e78b3d85cbe275f8b294b60de4354b48063d5fa6c10f3b35",
+                    "stateRoot" : "0xd337a751454f600ba1d646f0bb0af2198d3a98322d58a743dacc73b245eac3b8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe2a4afeba94cb9b9dee5a1b949908bf81c02b7d1c8630b813088b678aa5b6b34",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d337a751454f600ba1d646f0bb0af2198d3a98322d58a743dacc73b245eac3b8a0e2a4afeba94cb9b9dee5a1b949908bf81c02b7d1c8630b813088b678aa5b6b34a0611f34cecb2d24d9e78b3d85cbe275f8b294b60de4354b48063d5fa6c10f3b35b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021f858203e880a06e9a10bb0ac65a50126fcb8c5ec73160a2f48c35715ec8543059bca2dc774cc788f87951042e1c4091f882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ca0ddbf3febd30b84a846ac82c7bdfb47755ffd0f6c51c7f319d02d4d3fa697cdbaa00d5191f44772f0c8b374d7712d218e01738bb78de2aef96ce841f36885ee3161c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
+                        "gasLimit" : "0x027100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xddbf3febd30b84a846ac82c7bdfb47755ffd0f6c51c7f319d02d4d3fa697cdba",
+                        "s" : "0x0d5191f44772f0c8b374d7712d218e01738bb78de2aef96ce841f36885ee3161",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x33942f1fc38ec5b2224dc75e14c48f0c34eb6b2009b121b83fcc0adcb1169123",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f61f85",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2f07b",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d3g2v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g2v0Filler.json"
         },
         "blocks" : [
@@ -217,9 +438,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x026893",
-                    "hash" : "0x0f335fc1064953cb28044c437c885ae74bad45cada6ed50407cab649b7fd0062",
-                    "mixHash" : "0x5f5f576a465628bd9d115e85be2447a1feec38e085413eed5683389a53d13815",
-                    "nonce" : "0xa84a1061eaaf4e0d",
+                    "hash" : "0x8e9f36120c60fcb76c9b4542c5e6ee8f9945a98a3e904ee3e38dc3c036d8dc44",
+                    "mixHash" : "0xd97f82f94a0f780e8762e283a91f7241585961314fe9c89fbf882e248b430068",
+                    "nonce" : "0xdaeeab0e3b20d96a",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xfaa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bc",
@@ -228,7 +449,7 @@
                     "transactionsTrie" : "0xe2a4afeba94cb9b9dee5a1b949908bf81c02b7d1c8630b813088b678aa5b6b34",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c7205499c9374238b01f9165469bffa499f1e737f29ea24b7db2a6602e0618ba0e2a4afeba94cb9b9dee5a1b949908bf81c02b7d1c8630b813088b678aa5b6b34a0faa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bcb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830268938203e880a05f5f576a465628bd9d115e85be2447a1feec38e085413eed5683389a53d1381588a84a1061eaaf4e0df882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ca0ddbf3febd30b84a846ac82c7bdfb47755ffd0f6c51c7f319d02d4d3fa697cdbaa00d5191f44772f0c8b374d7712d218e01738bb78de2aef96ce841f36885ee3161c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c7205499c9374238b01f9165469bffa499f1e737f29ea24b7db2a6602e0618ba0e2a4afeba94cb9b9dee5a1b949908bf81c02b7d1c8630b813088b678aa5b6b34a0faa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bcb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830268938203e880a0d97f82f94a0f780e8762e283a91f7241585961314fe9c89fbf882e248b43006888daeeab0e3b20d96af882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ca0ddbf3febd30b84a846ac82c7bdfb47755ffd0f6c51c7f319d02d4d3fa697cdbaa00d5191f44772f0c8b374d7712d218e01738bb78de2aef96ce841f36885ee3161c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -265,8 +486,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0f335fc1064953cb28044c437c885ae74bad45cada6ed50407cab649b7fd0062",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8e9f36120c60fcb76c9b4542c5e6ee8f9945a98a3e904ee3e38dc3c036d8dc44",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f66893",
@@ -405,10 +626,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g2v0_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d3g2v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g2v0Filler.json"
         },
         "blocks" : [
@@ -419,19 +640,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x027100",
-                    "hash" : "0x87ba18702c5e455c83a0fbca9be54983e9a8c7d0ca17ba783ce6a9fbb62baa19",
-                    "mixHash" : "0x970087db41fe0ec7d5c5799bb7ed9ff59db368ba0074d49dddc7d6fd40de3e52",
-                    "nonce" : "0x5461241d9326166b",
+                    "gasUsed" : "0x026893",
+                    "hash" : "0x8f5f23ebb5c410ab487a0b9cd86fccfbb65f64bedeba807ef99118d9624e95f7",
+                    "mixHash" : "0xad8bf42905ff39af62221ac9673c58daf693748aa4a211ea540326df9fbcddf2",
+                    "nonce" : "0x8126cb5d8d424623",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
-                    "stateRoot" : "0x73f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26e",
+                    "receiptTrie" : "0xfaa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bc",
+                    "stateRoot" : "0x1c7205499c9374238b01f9165469bffa499f1e737f29ea24b7db2a6602e0618b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe2a4afeba94cb9b9dee5a1b949908bf81c02b7d1c8630b813088b678aa5b6b34",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea0e2a4afeba94cb9b9dee5a1b949908bf81c02b7d1c8630b813088b678aa5b6b34a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0970087db41fe0ec7d5c5799bb7ed9ff59db368ba0074d49dddc7d6fd40de3e52885461241d9326166bf882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ca0ddbf3febd30b84a846ac82c7bdfb47755ffd0f6c51c7f319d02d4d3fa697cdbaa00d5191f44772f0c8b374d7712d218e01738bb78de2aef96ce841f36885ee3161c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c7205499c9374238b01f9165469bffa499f1e737f29ea24b7db2a6602e0618ba0e2a4afeba94cb9b9dee5a1b949908bf81c02b7d1c8630b813088b678aa5b6b34a0faa2e156b8d59a5de70c0de332b5560ed27fe3e3e45dbf5ff18987da350e94bcb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830268938203e880a0ad8bf42905ff39af62221ac9673c58daf693748aa4a211ea540326df9fbcddf2888126cb5d8d424623f882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ca0ddbf3febd30b84a846ac82c7bdfb47755ffd0f6c51c7f319d02d4d3fa697cdbaa00d5191f44772f0c8b374d7712d218e01738bb78de2aef96ce841f36885ee3161c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -468,11 +689,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x87ba18702c5e455c83a0fbca9be54983e9a8c7d0ca17ba783ce6a9fbb62baa19",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8f5f23ebb5c410ab487a0b9cd86fccfbb65f64bedeba807ef99118d9624e95f7",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f67100",
+                "balance" : "0x4563918244f66893",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,7 +728,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a29f00",
+                "balance" : "0xe8d4a2a76d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -608,10 +829,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g2v0_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d3g2v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g2v0Filler.json"
         },
         "blocks" : [
@@ -623,9 +844,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0xe4fdfac06e80b03ceed7ad7d492e0000f51dfdf1bafd4a1e4144e8af4b7472a8",
-                    "mixHash" : "0x3d4b2615e4e1553db2b6cba72351a8890246ae5aec779a2dd64d5020fc735e30",
-                    "nonce" : "0xb90bdf0cac3ca481",
+                    "hash" : "0xf012254322699523eb561847cc08ff556b7a846a830b01608df24766e3c633e7",
+                    "mixHash" : "0xd87d9efd2131150e7f14c0004d0663cf0565de4d7aa6d526d1d9061687f705d1",
+                    "nonce" : "0x59736cead35d685b",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
@@ -634,7 +855,7 @@
                     "transactionsTrie" : "0xe2a4afeba94cb9b9dee5a1b949908bf81c02b7d1c8630b813088b678aa5b6b34",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea0e2a4afeba94cb9b9dee5a1b949908bf81c02b7d1c8630b813088b678aa5b6b34a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a03d4b2615e4e1553db2b6cba72351a8890246ae5aec779a2dd64d5020fc735e3088b90bdf0cac3ca481f882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ca0ddbf3febd30b84a846ac82c7bdfb47755ffd0f6c51c7f319d02d4d3fa697cdbaa00d5191f44772f0c8b374d7712d218e01738bb78de2aef96ce841f36885ee3161c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea0e2a4afeba94cb9b9dee5a1b949908bf81c02b7d1c8630b813088b678aa5b6b34a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0d87d9efd2131150e7f14c0004d0663cf0565de4d7aa6d526d1d9061687f705d18859736cead35d685bf882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ca0ddbf3febd30b84a846ac82c7bdfb47755ffd0f6c51c7f319d02d4d3fa697cdbaa00d5191f44772f0c8b374d7712d218e01738bb78de2aef96ce841f36885ee3161c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -671,8 +892,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe4fdfac06e80b03ceed7ad7d492e0000f51dfdf1bafd4a1e4144e8af4b7472a8",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf012254322699523eb561847cc08ff556b7a846a830b01608df24766e3c633e7",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f67100",
@@ -811,10 +1032,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g2v0_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d3g2v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g2v0Filler.json"
         },
         "blocks" : [
@@ -825,19 +1046,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x021f85",
-                    "hash" : "0x5de1c5bb99c72b9d18e41495bdea476b3800a0f10ab857ccd68867d5c37b7d1b",
-                    "mixHash" : "0x9c27f2033bb9e28e1dfcf17f6cbb68d285ede65cef7b86a65a351f3ec68ad1b2",
-                    "nonce" : "0x0f6fd8a7a4b04035",
+                    "gasUsed" : "0x027100",
+                    "hash" : "0xfb5bee66c86726bb8e801b7f30179dfed7a604f95e2b0ccc926d526ce9f77e2b",
+                    "mixHash" : "0xd2af97e746dffcb0dd2d321864396df29e409fb5832a40ce3b26a018c02847d3",
+                    "nonce" : "0x7b29fb4d33050cfb",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x611f34cecb2d24d9e78b3d85cbe275f8b294b60de4354b48063d5fa6c10f3b35",
-                    "stateRoot" : "0xd337a751454f600ba1d646f0bb0af2198d3a98322d58a743dacc73b245eac3b8",
+                    "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
+                    "stateRoot" : "0x73f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe2a4afeba94cb9b9dee5a1b949908bf81c02b7d1c8630b813088b678aa5b6b34",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d337a751454f600ba1d646f0bb0af2198d3a98322d58a743dacc73b245eac3b8a0e2a4afeba94cb9b9dee5a1b949908bf81c02b7d1c8630b813088b678aa5b6b34a0611f34cecb2d24d9e78b3d85cbe275f8b294b60de4354b48063d5fa6c10f3b35b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083021f858203e880a09c27f2033bb9e28e1dfcf17f6cbb68d285ede65cef7b86a65a351f3ec68ad1b2880f6fd8a7a4b04035f882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ca0ddbf3febd30b84a846ac82c7bdfb47755ffd0f6c51c7f319d02d4d3fa697cdbaa00d5191f44772f0c8b374d7712d218e01738bb78de2aef96ce841f36885ee3161c0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea0e2a4afeba94cb9b9dee5a1b949908bf81c02b7d1c8630b813088b678aa5b6b34a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0d2af97e746dffcb0dd2d321864396df29e409fb5832a40ce3b26a018c02847d3887b29fb4d33050cfbf882f88080018302710094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ca0ddbf3febd30b84a846ac82c7bdfb47755ffd0f6c51c7f319d02d4d3fa697cdbaa00d5191f44772f0c8b374d7712d218e01738bb78de2aef96ce841f36885ee3161c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -874,18 +1095,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5de1c5bb99c72b9d18e41495bdea476b3800a0f10ab857ccd68867d5c37b7d1b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xfb5bee66c86726bb8e801b7f30179dfed7a604f95e2b0ccc926d526ce9f77e2b",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f61f85",
+                "balance" : "0x4563918244f67100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -917,12 +1131,10 @@
                 "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x04" : "0x0c",
-                    "0x05" : "0x0c"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2f07b",
+                "balance" : "0xe8d4a29f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g2v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g2v1.json
index f16dd0c0b..40eed0df5 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g2v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g2v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d3g2v1_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d3g2v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g2v1Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x026920",
-                    "hash" : "0x54eff595a59fc0079597274e9ee4a0d557e4a82e6382e346c22dde038f782f35",
-                    "mixHash" : "0x20ad37f61e9b9a9a62a13f80054aa4493b50487a9951a0ce9622754c3462d3cd",
-                    "nonce" : "0xd6e4585e8685b821",
+                    "gasUsed" : "0x0239b1",
+                    "hash" : "0x10f1c2cc8a60588bca84f20fd2e8566206b207ca1887ce7233be267ec3cef8bc",
+                    "mixHash" : "0x10197fcf0f34887ca5f31126b3b6464b4d3a6712a68f46a70caf7219608cd5cd",
+                    "nonce" : "0xaf5ebe98174eb786",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0c",
-                    "stateRoot" : "0xc1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750af",
+                    "receiptTrie" : "0x0dbafe61adf97a116d70e0ff51248faa1c5eb43b68b1192ed798d9c14e847c3f",
+                    "stateRoot" : "0x0d59e1e847c80f9897465234c5e98375d4f64060af57ffef427880b340c2a17e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750afa0998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71a0ab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830269208203e880a020ad37f61e9b9a9a62a13f80054aa4493b50487a9951a0ce9622754c3462d3cd88d6e4585e8685b821f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0d0ced25706feb5a6a32e0d326ea42eeb22d21a87f01ec6cf83cb577b861cac3ea02fb81b99dcf1c71d4ee2a61a84cf61a2d0164235d82ebfb3c1e809ac91f53bafc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00d59e1e847c80f9897465234c5e98375d4f64060af57ffef427880b340c2a17ea0998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71a00dbafe61adf97a116d70e0ff51248faa1c5eb43b68b1192ed798d9c14e847c3fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239b18203e880a010197fcf0f34887ca5f31126b3b6464b4d3a6712a68f46a70caf7219608cd5cd88af5ebe98174eb786f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0d0ced25706feb5a6a32e0d326ea42eeb22d21a87f01ec6cf83cb577b861cac3ea02fb81b99dcf1c71d4ee2a61a84cf61a2d0164235d82ebfb3c1e809ac91f53bafc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x54eff595a59fc0079597274e9ee4a0d557e4a82e6382e346c22dde038f782f35",
-        "network" : "EIP150",
+        "lastblockhash" : "0x10f1c2cc8a60588bca84f20fd2e8566206b207ca1887ce7233be267ec3cef8bc",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f66920",
+                "balance" : "0x4563918244f639b1",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -94,21 +101,235 @@
                 }
             },
             "0xa300000000000000000000000000000000000000" : {
-                "balance" : "0x00",
+                "balance" : "0x0a",
                 "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2a6d6",
+                "balance" : "0xe8d4a2d645",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d3g2v1_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g2v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0239b1",
+                    "hash" : "0x2d2cb0c4607e4399ad8da3067a018e53fc9569328a0cc53a3d58656a1296f511",
+                    "mixHash" : "0x6882d3c41e59332d18bce3a52139f50db7df63f70ff8b36c4ce5c7f39b75acf6",
+                    "nonce" : "0xddd33e3ed96a8fa6",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0x0dbafe61adf97a116d70e0ff51248faa1c5eb43b68b1192ed798d9c14e847c3f",
+                    "stateRoot" : "0x0d59e1e847c80f9897465234c5e98375d4f64060af57ffef427880b340c2a17e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00d59e1e847c80f9897465234c5e98375d4f64060af57ffef427880b340c2a17ea0998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71a00dbafe61adf97a116d70e0ff51248faa1c5eb43b68b1192ed798d9c14e847c3fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239b18203e880a06882d3c41e59332d18bce3a52139f50db7df63f70ff8b36c4ce5c7f39b75acf688ddd33e3ed96a8fa6f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0d0ced25706feb5a6a32e0d326ea42eeb22d21a87f01ec6cf83cb577b861cac3ea02fb81b99dcf1c71d4ee2a61a84cf61a2d0164235d82ebfb3c1e809ac91f53bafc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
+                        "gasLimit" : "0x027100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd0ced25706feb5a6a32e0d326ea42eeb22d21a87f01ec6cf83cb577b861cac3e",
+                        "s" : "0x2fb81b99dcf1c71d4ee2a61a84cf61a2d0164235d82ebfb3c1e809ac91f53baf",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2d2cb0c4607e4399ad8da3067a018e53fc9569328a0cc53a3d58656a1296f511",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f639b1",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
                 "balance" : "0x0a",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2d645",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
@@ -202,10 +423,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g2v1_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d3g2v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g2v1Filler.json"
         },
         "blocks" : [
@@ -217,9 +438,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x026920",
-                    "hash" : "0xfafde0b7eedd79614cd271360d35e6ebe47bf1eb0e698b5e1f7672ffd99eb171",
-                    "mixHash" : "0x6d4913fb17fe5821b0dde89b5d4c948774aa6c54592fe539e0a11fc99afd698f",
-                    "nonce" : "0x23dcb090d7cd24c9",
+                    "hash" : "0xbc04987ec24174c37a5fc9699558d5cd07a379f56cb9fb34340efddd5ca35544",
+                    "mixHash" : "0x2e1ab82e55551972cdefde1f9a4601c3a9298d4dbe1b23a6865d54323b8d69e2",
+                    "nonce" : "0x596817c7473ee420",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0c",
@@ -228,7 +449,7 @@
                     "transactionsTrie" : "0x998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750afa0998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71a0ab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830269208203e880a06d4913fb17fe5821b0dde89b5d4c948774aa6c54592fe539e0a11fc99afd698f8823dcb090d7cd24c9f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0d0ced25706feb5a6a32e0d326ea42eeb22d21a87f01ec6cf83cb577b861cac3ea02fb81b99dcf1c71d4ee2a61a84cf61a2d0164235d82ebfb3c1e809ac91f53bafc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750afa0998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71a0ab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830269208203e880a02e1ab82e55551972cdefde1f9a4601c3a9298d4dbe1b23a6865d54323b8d69e288596817c7473ee420f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0d0ced25706feb5a6a32e0d326ea42eeb22d21a87f01ec6cf83cb577b861cac3ea02fb81b99dcf1c71d4ee2a61a84cf61a2d0164235d82ebfb3c1e809ac91f53bafc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -265,8 +486,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfafde0b7eedd79614cd271360d35e6ebe47bf1eb0e698b5e1f7672ffd99eb171",
-        "network" : "EIP158",
+        "lastblockhash" : "0xbc04987ec24174c37a5fc9699558d5cd07a379f56cb9fb34340efddd5ca35544",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f66920",
@@ -405,10 +626,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g2v1_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d3g2v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g2v1Filler.json"
         },
         "blocks" : [
@@ -419,19 +640,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x027100",
-                    "hash" : "0xb0837fb45647f30e74e29963bd3bd41ce7fbd128e8438d2ca28a10ca59d7f5f5",
-                    "mixHash" : "0xe7b83131c5edcaabb272234bbffa180d346f8013e9f5504a02dc524595551af5",
-                    "nonce" : "0x9a4767ff77d16394",
+                    "gasUsed" : "0x026920",
+                    "hash" : "0xe8bb66dc8eb0ccb70a2b82cec959149abdd427ed9ba405c32b0b03f390078ccd",
+                    "mixHash" : "0x198cc2491d0080c05da8cef772365a46d72f3411abaed829ab1d150a9795d461",
+                    "nonce" : "0x477af9ad13dbc1ff",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
-                    "stateRoot" : "0x73f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26e",
+                    "receiptTrie" : "0xab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0c",
+                    "stateRoot" : "0xc1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750af",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea0998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0e7b83131c5edcaabb272234bbffa180d346f8013e9f5504a02dc524595551af5889a4767ff77d16394f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0d0ced25706feb5a6a32e0d326ea42eeb22d21a87f01ec6cf83cb577b861cac3ea02fb81b99dcf1c71d4ee2a61a84cf61a2d0164235d82ebfb3c1e809ac91f53bafc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1052163a11c378255622a0bba1af53643d59fc316fc4d58e7c4bb1a1b4750afa0998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71a0ab0391dc9029afbf1489a2aff6c8a4eee0505d0aaeed5a538d37a56225d8ef0cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830269208203e880a0198cc2491d0080c05da8cef772365a46d72f3411abaed829ab1d150a9795d46188477af9ad13dbc1fff882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0d0ced25706feb5a6a32e0d326ea42eeb22d21a87f01ec6cf83cb577b861cac3ea02fb81b99dcf1c71d4ee2a61a84cf61a2d0164235d82ebfb3c1e809ac91f53bafc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -468,11 +689,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb0837fb45647f30e74e29963bd3bd41ce7fbd128e8438d2ca28a10ca59d7f5f5",
-        "network" : "Frontier",
+        "lastblockhash" : "0xe8bb66dc8eb0ccb70a2b82cec959149abdd427ed9ba405c32b0b03f390078ccd",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f67100",
+                "balance" : "0x4563918244f66920",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,14 +728,14 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a29f00",
+                "balance" : "0xe8d4a2a6d6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
-                "balance" : "0x00",
+                "balance" : "0x0a",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
@@ -608,10 +829,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g2v1_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d3g2v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g2v1Filler.json"
         },
         "blocks" : [
@@ -623,9 +844,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0x22d937c83d891d8b108e830ce4667ecad3a23101447a9a687aae3651868a1668",
-                    "mixHash" : "0x3f6c4c33de8278ef6e3451131a2a952a84a3bb7bcb4295a2450e05aeacc0f9ac",
-                    "nonce" : "0xeea8ff71b9190186",
+                    "hash" : "0x18bde4185e59d3460e163057bfb9651c2ebeea9995486fa443483fadf8edd200",
+                    "mixHash" : "0x4e17b601a381b916e927ca63cb3f903808a1808b8dd5781f0921a479153e22ef",
+                    "nonce" : "0x10525a9ddc352ca9",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
@@ -634,7 +855,7 @@
                     "transactionsTrie" : "0x998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea0998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a03f6c4c33de8278ef6e3451131a2a952a84a3bb7bcb4295a2450e05aeacc0f9ac88eea8ff71b9190186f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0d0ced25706feb5a6a32e0d326ea42eeb22d21a87f01ec6cf83cb577b861cac3ea02fb81b99dcf1c71d4ee2a61a84cf61a2d0164235d82ebfb3c1e809ac91f53bafc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea0998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a04e17b601a381b916e927ca63cb3f903808a1808b8dd5781f0921a479153e22ef8810525a9ddc352ca9f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0d0ced25706feb5a6a32e0d326ea42eeb22d21a87f01ec6cf83cb577b861cac3ea02fb81b99dcf1c71d4ee2a61a84cf61a2d0164235d82ebfb3c1e809ac91f53bafc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -671,8 +892,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x22d937c83d891d8b108e830ce4667ecad3a23101447a9a687aae3651868a1668",
-        "network" : "Homestead",
+        "lastblockhash" : "0x18bde4185e59d3460e163057bfb9651c2ebeea9995486fa443483fadf8edd200",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f67100",
@@ -811,10 +1032,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g2v1_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d3g2v1_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g2v1Filler.json"
         },
         "blocks" : [
@@ -825,19 +1046,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0239b1",
-                    "hash" : "0x9036168ec7d69148989a6d4e21e8bf17f7304394fba3a6a9b18973495dc0934c",
-                    "mixHash" : "0x03115e95bc9d0c9923249c29421e09499ab4bc3e8dcabbf2e1318247e427403d",
-                    "nonce" : "0xb7186c824127ba7e",
+                    "gasUsed" : "0x027100",
+                    "hash" : "0x95ccf71d9a057355e78f2b0d660051b47fd835e32093dece18b71511fbbba7f7",
+                    "mixHash" : "0x3109c2e893edb766f5fbff641df616c5a0ff95c45f2998f93b33d6239b776b70",
+                    "nonce" : "0x6fa960be35b66548",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x0dbafe61adf97a116d70e0ff51248faa1c5eb43b68b1192ed798d9c14e847c3f",
-                    "stateRoot" : "0x0d59e1e847c80f9897465234c5e98375d4f64060af57ffef427880b340c2a17e",
+                    "receiptTrie" : "0x6b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87",
+                    "stateRoot" : "0x73f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00d59e1e847c80f9897465234c5e98375d4f64060af57ffef427880b340c2a17ea0998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71a00dbafe61adf97a116d70e0ff51248faa1c5eb43b68b1192ed798d9c14e847c3fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830239b18203e880a003115e95bc9d0c9923249c29421e09499ab4bc3e8dcabbf2e1318247e427403d88b7186c824127ba7ef882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0d0ced25706feb5a6a32e0d326ea42eeb22d21a87f01ec6cf83cb577b861cac3ea02fb81b99dcf1c71d4ee2a61a84cf61a2d0164235d82ebfb3c1e809ac91f53bafc0",
+                "rlp" : "0xf90280f901f8a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f883b45331cdf244875fbaa339495cb927f5556000de99907d265d68e8e26ea0998e9d6946a66813b07de8ac587a2cc3c51a38fa46e55f96b2b0c7812fe34b71a06b09d01aaf2bde8fd12a03b57ab9920fb60343c593ecddb72e143e608c6e5a87b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a03109c2e893edb766f5fbff641df616c5a0ff95c45f2998f93b33d6239b776b70886fa960be35b66548f882f88080018302710094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0d0ced25706feb5a6a32e0d326ea42eeb22d21a87f01ec6cf83cb577b861cac3ea02fb81b99dcf1c71d4ee2a61a84cf61a2d0164235d82ebfb3c1e809ac91f53bafc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -874,18 +1095,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9036168ec7d69148989a6d4e21e8bf17f7304394fba3a6a9b18973495dc0934c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x95ccf71d9a057355e78f2b0d660051b47fd835e32093dece18b71511fbbba7f7",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f639b1",
+                "balance" : "0x4563918244f67100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -913,16 +1127,14 @@
                 }
             },
             "0xa300000000000000000000000000000000000000" : {
-                "balance" : "0x0a",
+                "balance" : "0x00",
                 "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x04" : "0x0c",
-                    "0x05" : "0x0c"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2d645",
+                "balance" : "0xe8d4a29f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g3v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g3v0.json
index 4217ec5e1..eb8a23520 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g3v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g3v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d3g3v0_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d3g3v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g3v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc19a",
-                    "hash" : "0xd944a9cdfae0f142d5f0ebd3e58e6f5d55947404339d8b07b7399da4110b26db",
-                    "mixHash" : "0x5b9613c3e1d14c05f3bff6a6823d1ae00c1d096eee80a93fec6e8e703f3d7fef",
-                    "nonce" : "0x7e52a1bbc655cceb",
+                    "hash" : "0x033fa038791bdb63a3bf74a2f64bebeba0787b8f5eb252b523b0baf39768bcde",
+                    "mixHash" : "0xb5d2e18f23344beb3f5b96f1ea9db42389af5ba19e708ea2cad259c477751e46",
+                    "nonce" : "0x36eeb5ca0e742fea",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0x49a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2",
-                    "stateRoot" : "0xb4256760b0753a45c56007cb8a35d18a80d9f299b53a760175cc01ceb6ca5f21",
+                    "receiptTrie" : "0xa5d0e8d32ee861e79b211e90c606d96e95bc73bea255ede5fb9fd90bb7cedb39",
+                    "stateRoot" : "0x0725c487930e2041eba0397686c9146c5f6febc65a64f425b8b748883d8428fc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb7fc693a253374cc86335a4c98e72b8981bca7c88d5c862cda6c7ee31287b52f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4256760b0753a45c56007cb8a35d18a80d9f299b53a760175cc01ceb6ca5f21a0b7fc693a253374cc86335a4c98e72b8981bca7c88d5c862cda6c7ee31287b52fa049a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a05b9613c3e1d14c05f3bff6a6823d1ae00c1d096eee80a93fec6e8e703f3d7fef887e52a1bbc655ccebf881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba00b5742b5ca5a5b830cf0b48610ea1601f1b9307c63d066b0ba1667590b903762a024a75b0ab6474fc010bdb31e21bd759ff6a18ff8301ab548c5f33df54fb82da8c0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00725c487930e2041eba0397686c9146c5f6febc65a64f425b8b748883d8428fca0b7fc693a253374cc86335a4c98e72b8981bca7c88d5c862cda6c7ee31287b52fa0a5d0e8d32ee861e79b211e90c606d96e95bc73bea255ede5fb9fd90bb7cedb39b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a0b5d2e18f23344beb3f5b96f1ea9db42389af5ba19e708ea2cad259c477751e468836eeb5ca0e742feaf881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba00b5742b5ca5a5b830cf0b48610ea1601f1b9307c63d066b0ba1667590b903762a024a75b0ab6474fc010bdb31e21bd759ff6a18ff8301ab548c5f33df54fb82da8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd944a9cdfae0f142d5f0ebd3e58e6f5d55947404339d8b07b7399da4110b26db",
-        "network" : "EIP150",
+        "lastblockhash" : "0x033fa038791bdb63a3bf74a2f64bebeba0787b8f5eb252b523b0baf39768bcde",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c19a",
                 "code" : "",
@@ -202,10 +209,220 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g3v0_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d3g3v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g3v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xc19a",
+                    "hash" : "0x3a663fb61436effd113bf0f889936dbd17cb42267c640c3b88c02cedae520f5f",
+                    "mixHash" : "0xae842dc044ad549abc0907b00b35941eae52687266d7a681a2e7e59a7dea94e4",
+                    "nonce" : "0xdc438c10c09a3e3d",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0xa5d0e8d32ee861e79b211e90c606d96e95bc73bea255ede5fb9fd90bb7cedb39",
+                    "stateRoot" : "0x0725c487930e2041eba0397686c9146c5f6febc65a64f425b8b748883d8428fc",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb7fc693a253374cc86335a4c98e72b8981bca7c88d5c862cda6c7ee31287b52f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00725c487930e2041eba0397686c9146c5f6febc65a64f425b8b748883d8428fca0b7fc693a253374cc86335a4c98e72b8981bca7c88d5c862cda6c7ee31287b52fa0a5d0e8d32ee861e79b211e90c606d96e95bc73bea255ede5fb9fd90bb7cedb39b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a0ae842dc044ad549abc0907b00b35941eae52687266d7a681a2e7e59a7dea94e488dc438c10c09a3e3df881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba00b5742b5ca5a5b830cf0b48610ea1601f1b9307c63d066b0ba1667590b903762a024a75b0ab6474fc010bdb31e21bd759ff6a18ff8301ab548c5f33df54fb82da8c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
+                        "gasLimit" : "0xc350",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0b5742b5ca5a5b830cf0b48610ea1601f1b9307c63d066b0ba1667590b903762",
+                        "s" : "0x24a75b0ab6474fc010bdb31e21bd759ff6a18ff8301ab548c5f33df54fb82da8",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3a663fb61436effd113bf0f889936dbd17cb42267c640c3b88c02cedae520f5f",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c19a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a44e66",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d3g3v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g3v0Filler.json"
         },
         "blocks" : [
@@ -217,9 +434,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc19a",
-                    "hash" : "0xcae10db824b93c5089ca41814a9e65a203c762992c785d33493b477b5dfcfb38",
-                    "mixHash" : "0x73cd6d6685f03f8230776fffd752e020424b3c1fb7d61b26c8c44b571afdc340",
-                    "nonce" : "0x874578b35d341342",
+                    "hash" : "0x35f958573dffe15f54a1ce3cea7a8b0273ad47f5d2306d74952309cf0695913e",
+                    "mixHash" : "0xac08f15ad30b976c5700cc7c5fd9907787a34ca0ab30d919ce70f3f3915fff26",
+                    "nonce" : "0xbe49da5d81e3572d",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0x49a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2",
@@ -228,7 +445,7 @@
                     "transactionsTrie" : "0xb7fc693a253374cc86335a4c98e72b8981bca7c88d5c862cda6c7ee31287b52f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4256760b0753a45c56007cb8a35d18a80d9f299b53a760175cc01ceb6ca5f21a0b7fc693a253374cc86335a4c98e72b8981bca7c88d5c862cda6c7ee31287b52fa049a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a073cd6d6685f03f8230776fffd752e020424b3c1fb7d61b26c8c44b571afdc34088874578b35d341342f881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba00b5742b5ca5a5b830cf0b48610ea1601f1b9307c63d066b0ba1667590b903762a024a75b0ab6474fc010bdb31e21bd759ff6a18ff8301ab548c5f33df54fb82da8c0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4256760b0753a45c56007cb8a35d18a80d9f299b53a760175cc01ceb6ca5f21a0b7fc693a253374cc86335a4c98e72b8981bca7c88d5c862cda6c7ee31287b52fa049a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a0ac08f15ad30b976c5700cc7c5fd9907787a34ca0ab30d919ce70f3f3915fff2688be49da5d81e3572df881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba00b5742b5ca5a5b830cf0b48610ea1601f1b9307c63d066b0ba1667590b903762a024a75b0ab6474fc010bdb31e21bd759ff6a18ff8301ab548c5f33df54fb82da8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -265,8 +482,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcae10db824b93c5089ca41814a9e65a203c762992c785d33493b477b5dfcfb38",
-        "network" : "EIP158",
+        "lastblockhash" : "0x35f958573dffe15f54a1ce3cea7a8b0273ad47f5d2306d74952309cf0695913e",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c19a",
@@ -405,10 +622,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g3v0_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d3g3v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g3v0Filler.json"
         },
         "blocks" : [
@@ -419,19 +636,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xc350",
-                    "hash" : "0x543f3d1b1c317d0f7b79a8938dd245986adda62a1ab6f0ba9cd2695493d65ef5",
-                    "mixHash" : "0x3015a42ac6808982ea4d852166a9e63b112315b6ee8cbb8c49883b79e132c2c4",
-                    "nonce" : "0x99ece81e86e9bb62",
+                    "gasUsed" : "0xc19a",
+                    "hash" : "0xab70970a15a845920c95d3c1100ac5b6831889a21347274e7b8b68c1ef337c6e",
+                    "mixHash" : "0xb8858d8a2e05c4035655a2146007af4235682bd98ca811bdeab284654123d36b",
+                    "nonce" : "0xc3f5542ea0038fe9",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xb30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5a",
-                    "stateRoot" : "0xda427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5",
+                    "receiptTrie" : "0x49a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2",
+                    "stateRoot" : "0xb4256760b0753a45c56007cb8a35d18a80d9f299b53a760175cc01ceb6ca5f21",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb7fc693a253374cc86335a4c98e72b8981bca7c88d5c862cda6c7ee31287b52f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a0b7fc693a253374cc86335a4c98e72b8981bca7c88d5c862cda6c7ee31287b52fa0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a03015a42ac6808982ea4d852166a9e63b112315b6ee8cbb8c49883b79e132c2c48899ece81e86e9bb62f881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba00b5742b5ca5a5b830cf0b48610ea1601f1b9307c63d066b0ba1667590b903762a024a75b0ab6474fc010bdb31e21bd759ff6a18ff8301ab548c5f33df54fb82da8c0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4256760b0753a45c56007cb8a35d18a80d9f299b53a760175cc01ceb6ca5f21a0b7fc693a253374cc86335a4c98e72b8981bca7c88d5c862cda6c7ee31287b52fa049a54f990bb04d7800d94e89926c81a62a26f7f68a783981ee51eb1d7ed843c2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a0b8858d8a2e05c4035655a2146007af4235682bd98ca811bdeab284654123d36b88c3f5542ea0038fe9f881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba00b5742b5ca5a5b830cf0b48610ea1601f1b9307c63d066b0ba1667590b903762a024a75b0ab6474fc010bdb31e21bd759ff6a18ff8301ab548c5f33df54fb82da8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -468,11 +685,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x543f3d1b1c317d0f7b79a8938dd245986adda62a1ab6f0ba9cd2695493d65ef5",
-        "network" : "Frontier",
+        "lastblockhash" : "0xab70970a15a845920c95d3c1100ac5b6831889a21347274e7b8b68c1ef337c6e",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4c350",
+                "balance" : "0x4563918244f4c19a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,7 +724,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a44cb0",
+                "balance" : "0xe8d4a44e66",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -608,10 +825,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g3v0_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d3g3v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g3v0Filler.json"
         },
         "blocks" : [
@@ -623,9 +840,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc350",
-                    "hash" : "0xb3c304f41aa470e88364264085f80ed8e29793da72b2bca8e6c4e6125ca70b35",
-                    "mixHash" : "0x4d44c4c8f0ed73e224901dbaaae7e60a2a98760b74f1b23d8f63b7b4cdc293b7",
-                    "nonce" : "0xdd589b82702e9605",
+                    "hash" : "0x0ae3e28e9dc915d005135a80ab136b3a4b02a37ba32b7b3c7c30a66950f92e66",
+                    "mixHash" : "0x75a7cbeea8ddd86068c5ad54cd50c0ceec68af76bc504a5160897eb028402101",
+                    "nonce" : "0x62d808939469b7e9",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xb30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5a",
@@ -634,7 +851,7 @@
                     "transactionsTrie" : "0xb7fc693a253374cc86335a4c98e72b8981bca7c88d5c862cda6c7ee31287b52f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a0b7fc693a253374cc86335a4c98e72b8981bca7c88d5c862cda6c7ee31287b52fa0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a04d44c4c8f0ed73e224901dbaaae7e60a2a98760b74f1b23d8f63b7b4cdc293b788dd589b82702e9605f881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba00b5742b5ca5a5b830cf0b48610ea1601f1b9307c63d066b0ba1667590b903762a024a75b0ab6474fc010bdb31e21bd759ff6a18ff8301ab548c5f33df54fb82da8c0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a0b7fc693a253374cc86335a4c98e72b8981bca7c88d5c862cda6c7ee31287b52fa0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a075a7cbeea8ddd86068c5ad54cd50c0ceec68af76bc504a5160897eb0284021018862d808939469b7e9f881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba00b5742b5ca5a5b830cf0b48610ea1601f1b9307c63d066b0ba1667590b903762a024a75b0ab6474fc010bdb31e21bd759ff6a18ff8301ab548c5f33df54fb82da8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -671,8 +888,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb3c304f41aa470e88364264085f80ed8e29793da72b2bca8e6c4e6125ca70b35",
-        "network" : "Homestead",
+        "lastblockhash" : "0x0ae3e28e9dc915d005135a80ab136b3a4b02a37ba32b7b3c7c30a66950f92e66",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c350",
@@ -811,10 +1028,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g3v0_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d3g3v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g3v0Filler.json"
         },
         "blocks" : [
@@ -825,19 +1042,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xc19a",
-                    "hash" : "0x3c3573d025bd5bec80466eff09fa44e0d2db87a6914792d214853dd297f4f187",
-                    "mixHash" : "0xeb61a99e195d396a1c8eec1e6b1966caba4b6817d458f3b979db314abd00064c",
-                    "nonce" : "0x077aa538cee037dc",
+                    "gasUsed" : "0xc350",
+                    "hash" : "0xb20c9cf50962b2a8f91644e67e782dcafa3f180cb9d76c07e808a1f3f81be094",
+                    "mixHash" : "0xc7157cfa1f86f09a1a85a9af299e03f6e715a03cc94d57130549bf6ad05f33f1",
+                    "nonce" : "0xf9f5da7f094a49fa",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xa5d0e8d32ee861e79b211e90c606d96e95bc73bea255ede5fb9fd90bb7cedb39",
-                    "stateRoot" : "0x0725c487930e2041eba0397686c9146c5f6febc65a64f425b8b748883d8428fc",
+                    "receiptTrie" : "0xb30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5a",
+                    "stateRoot" : "0xda427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb7fc693a253374cc86335a4c98e72b8981bca7c88d5c862cda6c7ee31287b52f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00725c487930e2041eba0397686c9146c5f6febc65a64f425b8b748883d8428fca0b7fc693a253374cc86335a4c98e72b8981bca7c88d5c862cda6c7ee31287b52fa0a5d0e8d32ee861e79b211e90c606d96e95bc73bea255ede5fb9fd90bb7cedb39b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c19a8203e880a0eb61a99e195d396a1c8eec1e6b1966caba4b6817d458f3b979db314abd00064c88077aa538cee037dcf881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba00b5742b5ca5a5b830cf0b48610ea1601f1b9307c63d066b0ba1667590b903762a024a75b0ab6474fc010bdb31e21bd759ff6a18ff8301ab548c5f33df54fb82da8c0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a0b7fc693a253374cc86335a4c98e72b8981bca7c88d5c862cda6c7ee31287b52fa0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a0c7157cfa1f86f09a1a85a9af299e03f6e715a03cc94d57130549bf6ad05f33f188f9f5da7f094a49faf881f87f800182c35094ac0000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba00b5742b5ca5a5b830cf0b48610ea1601f1b9307c63d066b0ba1667590b903762a024a75b0ab6474fc010bdb31e21bd759ff6a18ff8301ab548c5f33df54fb82da8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -874,18 +1091,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3c3573d025bd5bec80466eff09fa44e0d2db87a6914792d214853dd297f4f187",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb20c9cf50962b2a8f91644e67e782dcafa3f180cb9d76c07e808a1f3f81be094",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4c19a",
+                "balance" : "0x4563918244f4c350",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -920,7 +1130,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a44e66",
+                "balance" : "0xe8d4a44cb0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g3v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g3v1.json
index aa8c5e0f4..3b05aba78 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g3v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeMultipleSubCalls_d3g3v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeMultipleSubCalls_d3g3v1_EIP150" : {
+    "RevertOpcodeMultipleSubCalls_d3g3v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g3v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc226",
-                    "hash" : "0xe91b5fd36a2f3d55fc52d1dce58baa4c5a9e6a480ee58bd5c22b930ec3e30ed4",
-                    "mixHash" : "0x5403cb13f6f27803ee6d4175cd8e94fa0e00bbbfadcc643b0a1429fc94a46f1a",
-                    "nonce" : "0xd302ed796d9f5b5e",
+                    "hash" : "0xcb9981b3c00950354819b27b5836128daec51e308269a85359aebb71cb343143",
+                    "mixHash" : "0x051580d7b8a2f16521b119c11841ff164d3e34a23e57c14a936e7d6e87f28eb7",
+                    "nonce" : "0x4ff192cfe9f121ee",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xc08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4c",
-                    "stateRoot" : "0xede8b4f79f3e9d00052f7a6111b2b15b7d2784ead53ac798c77024c2f0cb5b06",
+                    "receiptTrie" : "0xbe3284c0f7a475fbc5c36b9a141a86ede36cdafe3c5e0928c790f55bab94282f",
+                    "stateRoot" : "0x3213a013e840252b435ab91b5ecc837800928f2d3ccef81bdc358cbd7f78e69b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1b745c86e2890cc22ac60cc4e19612ec27c84c8ae42ee54a1118d4ea8638951e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ede8b4f79f3e9d00052f7a6111b2b15b7d2784ead53ac798c77024c2f0cb5b06a01b745c86e2890cc22ac60cc4e19612ec27c84c8ae42ee54a1118d4ea8638951ea0c08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a05403cb13f6f27803ee6d4175cd8e94fa0e00bbbfadcc643b0a1429fc94a46f1a88d302ed796d9f5b5ef881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0169eb3c05cc6bdb8b163eb7dc19b0936bbc44a57f334cbbf04d52d6f4e99614fa07f5dbcf4b288d2fecc6856cfc89f721701d71b05dba754ebb301a0bff40946b0c0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03213a013e840252b435ab91b5ecc837800928f2d3ccef81bdc358cbd7f78e69ba01b745c86e2890cc22ac60cc4e19612ec27c84c8ae42ee54a1118d4ea8638951ea0be3284c0f7a475fbc5c36b9a141a86ede36cdafe3c5e0928c790f55bab94282fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a0051580d7b8a2f16521b119c11841ff164d3e34a23e57c14a936e7d6e87f28eb7884ff192cfe9f121eef881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0169eb3c05cc6bdb8b163eb7dc19b0936bbc44a57f334cbbf04d52d6f4e99614fa07f5dbcf4b288d2fecc6856cfc89f721701d71b05dba754ebb301a0bff40946b0c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe91b5fd36a2f3d55fc52d1dce58baa4c5a9e6a480ee58bd5c22b930ec3e30ed4",
-        "network" : "EIP150",
+        "lastblockhash" : "0xcb9981b3c00950354819b27b5836128daec51e308269a85359aebb71cb343143",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c226",
                 "code" : "",
@@ -202,10 +209,220 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g3v1_EIP158" : {
+    "RevertOpcodeMultipleSubCalls_d3g3v1_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g3v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xc226",
+                    "hash" : "0x5d3ecd6aff07b8f7ddd4901b7a5fad4613cfaf278819fd8eb9414d079e8aa3af",
+                    "mixHash" : "0xf0f9a2c731a6170cef1f3e3dd958ee2ef94f19a48d650a01291d3b199fe88bee",
+                    "nonce" : "0x063ff2fd6cf949cf",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+                    "receiptTrie" : "0xbe3284c0f7a475fbc5c36b9a141a86ede36cdafe3c5e0928c790f55bab94282f",
+                    "stateRoot" : "0x3213a013e840252b435ab91b5ecc837800928f2d3ccef81bdc358cbd7f78e69b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1b745c86e2890cc22ac60cc4e19612ec27c84c8ae42ee54a1118d4ea8638951e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03213a013e840252b435ab91b5ecc837800928f2d3ccef81bdc358cbd7f78e69ba01b745c86e2890cc22ac60cc4e19612ec27c84c8ae42ee54a1118d4ea8638951ea0be3284c0f7a475fbc5c36b9a141a86ede36cdafe3c5e0928c790f55bab94282fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a0f0f9a2c731a6170cef1f3e3dd958ee2ef94f19a48d650a01291d3b199fe88bee88063ff2fd6cf949cff881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0169eb3c05cc6bdb8b163eb7dc19b0936bbc44a57f334cbbf04d52d6f4e99614fa07f5dbcf4b288d2fecc6856cfc89f721701d71b05dba754ebb301a0bff40946b0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
+                        "gasLimit" : "0xc350",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x169eb3c05cc6bdb8b163eb7dc19b0936bbc44a57f334cbbf04d52d6f4e99614f",
+                        "s" : "0x7f5dbcf4b288d2fecc6856cfc89f721701d71b05dba754ebb301a0bff40946b0",
+                        "to" : "0xac00000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5d3ecd6aff07b8f7ddd4901b7a5fad4613cfaf278819fd8eb9414d079e8aa3af",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4c226",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a44dd0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x0a",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a556000600060006000600073c00000000000000000000000000000000000000061c350f1600b556000600060006000600073d00000000000000000000000000000000000000061c350f1600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f2600a556000600060006000600073c00000000000000000000000000000000000000061c350f2600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600073b00000000000000000000000000000000000000061c350f4600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b55600060006000600073d00000000000000000000000000000000000000061c350f4600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073b00000000000000000000000000000000000000061c350f1600a55600060006000600073c00000000000000000000000000000000000000061c350f4600b556000600060006000600073d00000000000000000000000000000000000000061c350f2600c55600c600455600c600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xac00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000346000356203f7a0f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60015560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60025560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600c60035560016000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeMultipleSubCalls_d3g3v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g3v1Filler.json"
         },
         "blocks" : [
@@ -217,9 +434,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc226",
-                    "hash" : "0x02c2293e8bfb1660050ddd2410142027b9e1c5b0ce884e471a34f9c67f15c7f5",
-                    "mixHash" : "0xb373b0349369bf2f375c64b5e6d822f7e5104a2765fd9fefb93a801008146143",
-                    "nonce" : "0x5369f8c33d5a265e",
+                    "hash" : "0x4c6cf62046578343f1c1d65250eefdc49625a5586e4d5f0cdb78bbaab773e682",
+                    "mixHash" : "0x32dbf6ccced778f845cd0184b324c0085aca2a923ad170bad3a00901bd0e9e77",
+                    "nonce" : "0x774aabd38b7ed85d",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xc08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4c",
@@ -228,7 +445,7 @@
                     "transactionsTrie" : "0x1b745c86e2890cc22ac60cc4e19612ec27c84c8ae42ee54a1118d4ea8638951e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ede8b4f79f3e9d00052f7a6111b2b15b7d2784ead53ac798c77024c2f0cb5b06a01b745c86e2890cc22ac60cc4e19612ec27c84c8ae42ee54a1118d4ea8638951ea0c08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a0b373b0349369bf2f375c64b5e6d822f7e5104a2765fd9fefb93a801008146143885369f8c33d5a265ef881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0169eb3c05cc6bdb8b163eb7dc19b0936bbc44a57f334cbbf04d52d6f4e99614fa07f5dbcf4b288d2fecc6856cfc89f721701d71b05dba754ebb301a0bff40946b0c0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ede8b4f79f3e9d00052f7a6111b2b15b7d2784ead53ac798c77024c2f0cb5b06a01b745c86e2890cc22ac60cc4e19612ec27c84c8ae42ee54a1118d4ea8638951ea0c08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a032dbf6ccced778f845cd0184b324c0085aca2a923ad170bad3a00901bd0e9e7788774aabd38b7ed85df881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0169eb3c05cc6bdb8b163eb7dc19b0936bbc44a57f334cbbf04d52d6f4e99614fa07f5dbcf4b288d2fecc6856cfc89f721701d71b05dba754ebb301a0bff40946b0c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -265,8 +482,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x02c2293e8bfb1660050ddd2410142027b9e1c5b0ce884e471a34f9c67f15c7f5",
-        "network" : "EIP158",
+        "lastblockhash" : "0x4c6cf62046578343f1c1d65250eefdc49625a5586e4d5f0cdb78bbaab773e682",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c226",
@@ -405,10 +622,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g3v1_Frontier" : {
+    "RevertOpcodeMultipleSubCalls_d3g3v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g3v1Filler.json"
         },
         "blocks" : [
@@ -419,19 +636,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xc350",
-                    "hash" : "0x93e92058eb3d5173ab055a18486f4d196461de3abd7475878a3e455e28c39209",
-                    "mixHash" : "0x89949bc1d862e09255098084f90948b4366ca83743ffb3a367d0bfbb0e53ecac",
-                    "nonce" : "0xaa9b79ad7d032ad4",
+                    "gasUsed" : "0xc226",
+                    "hash" : "0x21e1660c2380a4f3a7f738fae211dbb99fd1c90676f5fff18ff6764d67739f3c",
+                    "mixHash" : "0xd5fc2d041bf06f7a7b62d8fd0d5dd0ff6022b6b6cf0ebb5951e976f05a01814d",
+                    "nonce" : "0x9ccb0d8c1da93316",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xb30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5a",
-                    "stateRoot" : "0xda427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5",
+                    "receiptTrie" : "0xc08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4c",
+                    "stateRoot" : "0xede8b4f79f3e9d00052f7a6111b2b15b7d2784ead53ac798c77024c2f0cb5b06",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1b745c86e2890cc22ac60cc4e19612ec27c84c8ae42ee54a1118d4ea8638951e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a01b745c86e2890cc22ac60cc4e19612ec27c84c8ae42ee54a1118d4ea8638951ea0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a089949bc1d862e09255098084f90948b4366ca83743ffb3a367d0bfbb0e53ecac88aa9b79ad7d032ad4f881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0169eb3c05cc6bdb8b163eb7dc19b0936bbc44a57f334cbbf04d52d6f4e99614fa07f5dbcf4b288d2fecc6856cfc89f721701d71b05dba754ebb301a0bff40946b0c0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ede8b4f79f3e9d00052f7a6111b2b15b7d2784ead53ac798c77024c2f0cb5b06a01b745c86e2890cc22ac60cc4e19612ec27c84c8ae42ee54a1118d4ea8638951ea0c08f5201bdbbcfdf72775416ba36980dea51a2e7e0ec797985251533546adf4cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a0d5fc2d041bf06f7a7b62d8fd0d5dd0ff6022b6b6cf0ebb5951e976f05a01814d889ccb0d8c1da93316f881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0169eb3c05cc6bdb8b163eb7dc19b0936bbc44a57f334cbbf04d52d6f4e99614fa07f5dbcf4b288d2fecc6856cfc89f721701d71b05dba754ebb301a0bff40946b0c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -468,11 +685,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x93e92058eb3d5173ab055a18486f4d196461de3abd7475878a3e455e28c39209",
-        "network" : "Frontier",
+        "lastblockhash" : "0x21e1660c2380a4f3a7f738fae211dbb99fd1c90676f5fff18ff6764d67739f3c",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4c350",
+                "balance" : "0x4563918244f4c226",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,14 +724,14 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a44cb0",
+                "balance" : "0xe8d4a44dd0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
-                "balance" : "0x00",
+                "balance" : "0x0a",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
@@ -608,10 +825,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g3v1_Homestead" : {
+    "RevertOpcodeMultipleSubCalls_d3g3v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g3v1Filler.json"
         },
         "blocks" : [
@@ -623,9 +840,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xc350",
-                    "hash" : "0xf77394c30f3308f466feb4c1b846df1aa46303cc7e12b3ccfbe2b541cbb0d3ac",
-                    "mixHash" : "0xc35b2dca19cd7d16114246211e6e468a431c55191662ed11930c665b21a20c22",
-                    "nonce" : "0x1bdc68f96c1b1536",
+                    "hash" : "0x5abc8c035e4c1dbc0a33069524eb2c7b7d2980ee3804d74880427c206d075cc3",
+                    "mixHash" : "0xafa02ca25477084fe0ed3689ed23e2e2204a8433c59ef16807757c99e96fe2fe",
+                    "nonce" : "0x8c57ba470924c432",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
                     "receiptTrie" : "0xb30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5a",
@@ -634,7 +851,7 @@
                     "transactionsTrie" : "0x1b745c86e2890cc22ac60cc4e19612ec27c84c8ae42ee54a1118d4ea8638951e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a01b745c86e2890cc22ac60cc4e19612ec27c84c8ae42ee54a1118d4ea8638951ea0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a0c35b2dca19cd7d16114246211e6e468a431c55191662ed11930c665b21a20c22881bdc68f96c1b1536f881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0169eb3c05cc6bdb8b163eb7dc19b0936bbc44a57f334cbbf04d52d6f4e99614fa07f5dbcf4b288d2fecc6856cfc89f721701d71b05dba754ebb301a0bff40946b0c0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a01b745c86e2890cc22ac60cc4e19612ec27c84c8ae42ee54a1118d4ea8638951ea0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a0afa02ca25477084fe0ed3689ed23e2e2204a8433c59ef16807757c99e96fe2fe888c57ba470924c432f881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0169eb3c05cc6bdb8b163eb7dc19b0936bbc44a57f334cbbf04d52d6f4e99614fa07f5dbcf4b288d2fecc6856cfc89f721701d71b05dba754ebb301a0bff40946b0c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -671,8 +888,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf77394c30f3308f466feb4c1b846df1aa46303cc7e12b3ccfbe2b541cbb0d3ac",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5abc8c035e4c1dbc0a33069524eb2c7b7d2980ee3804d74880427c206d075cc3",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4c350",
@@ -811,10 +1028,10 @@
             }
         }
     },
-    "RevertOpcodeMultipleSubCalls_d3g3v1_Metropolis" : {
+    "RevertOpcodeMultipleSubCalls_d3g3v1_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeMultipleSubCalls_d3g3v1Filler.json"
         },
         "blocks" : [
@@ -825,19 +1042,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xc226",
-                    "hash" : "0x277cfb1d1a979abc36bfccfc6ddff243930cb8a6f09c8ab6faa13d7e4b453d04",
-                    "mixHash" : "0xd3cad3656cc20847c82137cb8d30c6a888f9c1e6286c97b439c79700ec4b92ac",
-                    "nonce" : "0x2ae91459ec1792cd",
+                    "gasUsed" : "0xc350",
+                    "hash" : "0xe7487e60213acb99ff73d79cffca571e3d652e2a971332ea7659e32a08decd8b",
+                    "mixHash" : "0x9a6d2717f6b0ea7c8344b568f69bd31f329b69b6390c0abc8696e011880793e6",
+                    "nonce" : "0xf6cbfb737f4eee22",
                     "number" : "0x01",
                     "parentHash" : "0x9c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fd",
-                    "receiptTrie" : "0xbe3284c0f7a475fbc5c36b9a141a86ede36cdafe3c5e0928c790f55bab94282f",
-                    "stateRoot" : "0x3213a013e840252b435ab91b5ecc837800928f2d3ccef81bdc358cbd7f78e69b",
+                    "receiptTrie" : "0xb30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5a",
+                    "stateRoot" : "0xda427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1b745c86e2890cc22ac60cc4e19612ec27c84c8ae42ee54a1118d4ea8638951e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03213a013e840252b435ab91b5ecc837800928f2d3ccef81bdc358cbd7f78e69ba01b745c86e2890cc22ac60cc4e19612ec27c84c8ae42ee54a1118d4ea8638951ea0be3284c0f7a475fbc5c36b9a141a86ede36cdafe3c5e0928c790f55bab94282fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c2268203e880a0d3cad3656cc20847c82137cb8d30c6a888f9c1e6286c97b439c79700ec4b92ac882ae91459ec1792cdf881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0169eb3c05cc6bdb8b163eb7dc19b0936bbc44a57f334cbbf04d52d6f4e99614fa07f5dbcf4b288d2fecc6856cfc89f721701d71b05dba754ebb301a0bff40946b0c0",
+                "rlp" : "0xf9027ef901f7a09c0c02b9a5a8b304b47336a09b24677ecde4273d5b90accfca80e0e7717310fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da427fc9836db148c3c991cc2828107e5ce901cc9e0ce847d12d122d82a8d1c5a01b745c86e2890cc22ac60cc4e19612ec27c84c8ae42ee54a1118d4ea8638951ea0b30a5e9eb40c194e73b126bb52c9f2fb06efd003198a1866995b11f5fe0e0f5ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082c3508203e880a09a6d2717f6b0ea7c8344b568f69bd31f329b69b6390c0abc8696e011880793e688f6cbfb737f4eee22f881f87f800182c35094ac000000000000000000000000000000000000000aa0000000000000000000000000a3000000000000000000000000000000000000001ca0169eb3c05cc6bdb8b163eb7dc19b0936bbc44a57f334cbbf04d52d6f4e99614fa07f5dbcf4b288d2fecc6856cfc89f721701d71b05dba754ebb301a0bff40946b0c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -874,18 +1091,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b33c44accff3f1d7776a868d7edfeb36f680a4e079cb885fd2d1bb1aa621d5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x277cfb1d1a979abc36bfccfc6ddff243930cb8a6f09c8ab6faa13d7e4b453d04",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe7487e60213acb99ff73d79cffca571e3d652e2a971332ea7659e32a08decd8b",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4c226",
+                "balance" : "0x4563918244f4c350",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -920,14 +1130,14 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a44dd0",
+                "balance" : "0xe8d4a44cb0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xac00000000000000000000000000000000000000" : {
-                "balance" : "0x0a",
+                "balance" : "0x00",
                 "code" : "0x6000600060006000346000356203f7a0f1",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d0g0v0.json
index 259098b3e..f3a3b8f51 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeReturn_d0g0v0_EIP150" : {
+    "RevertOpcodeReturn_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/stRevertTest/RevertOpcodeReturn_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x02c6ab",
-                    "hash" : "0xac457ce8fb5ee10980cce137d101b42ca6271d446fdbb86ba2501e8706f5e5b1",
-                    "mixHash" : "0xcb0bb8b2f432b2e4256b62a2d00a35397d5e5bd7ac407ab559dea4fb94a6d82c",
-                    "nonce" : "0x1dd0ebaa7502d886",
+                    "gasUsed" : "0x01058b",
+                    "hash" : "0xab8643325efb83c2bb9ba8be825613632444b54ad5eee39d35581499813af6d9",
+                    "mixHash" : "0xe8ac48c6eeba36e7fc370371a9bdec7ebe45b2fcfea651d359f4b48429b539c1",
+                    "nonce" : "0xcda076d6c46fa130",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0xc37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497",
-                    "stateRoot" : "0x5a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0",
+                    "receiptTrie" : "0xdecd48a1b2602b3c347497cef156b94fa0682ee16b3c347f3cf36ea063be4da3",
+                    "stateRoot" : "0xd281cb4a35c0fd487330a2ec298313f27a9a37e6a0e9da55aad88d01928a55ef",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9980066761fb7a6502e227077a05c07a726137b9fce41cada3e04c4f57ac99f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0a0c9980066761fb7a6502e227077a05c07a726137b9fce41cada3e04c4f57ac99fa0c37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a0cb0bb8b2f432b2e4256b62a2d00a35397d5e5bd7ac407ab559dea4fb94a6d82c881dd0ebaa7502d886f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca030040273c49735e5144b1bd19cbb76d36172d15ad81ae28eb1ee9a8bf6f0fc64a05ab73b1dc50791d509dde59c01e4a763de6b78c1430e627f3bfd919705369ef0c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d281cb4a35c0fd487330a2ec298313f27a9a37e6a0e9da55aad88d01928a55efa0c9980066761fb7a6502e227077a05c07a726137b9fce41cada3e04c4f57ac99fa0decd48a1b2602b3c347497cef156b94fa0682ee16b3c347f3cf36ea063be4da3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301058b8203e880a0e8ac48c6eeba36e7fc370371a9bdec7ebe45b2fcfea651d359f4b48429b539c188cda076d6c46fa130f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca030040273c49735e5144b1bd19cbb76d36172d15ad81ae28eb1ee9a8bf6f0fc64a05ab73b1dc50791d509dde59c01e4a763de6b78c1430e627f3bfd919705369ef0c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xac457ce8fb5ee10980cce137d101b42ca6271d446fdbb86ba2501e8706f5e5b1",
-        "network" : "EIP150",
+        "lastblockhash" : "0xab8643325efb83c2bb9ba8be825613632444b54ad5eee39d35581499813af6d9",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f6c6ab",
+                "balance" : "0x4563918244f5058b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -77,6 +84,7 @@
                 "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x02" : "0x726576657274206d657373616765"
                 }
             },
             "0xa100000000000000000000000000000000000000" : {
@@ -122,7 +130,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a24955",
+                "balance" : "0xe8d4a40a75",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -188,10 +196,207 @@
             }
         }
     },
-    "RevertOpcodeReturn_d0g0v0_EIP158" : {
+    "RevertOpcodeReturn_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/stRevertTest/RevertOpcodeReturn_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01058b",
+                    "hash" : "0x2db9a7144825a870e21f638501108b7fcecedeb0c11f22ab41ef888cf39a28b6",
+                    "mixHash" : "0x238d04fe386a5e05bfdf4a24088c23d51cd5abb6e2ce396cee260693681a28ee",
+                    "nonce" : "0xcab02ab25c932155",
+                    "number" : "0x01",
+                    "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
+                    "receiptTrie" : "0xdecd48a1b2602b3c347497cef156b94fa0682ee16b3c347f3cf36ea063be4da3",
+                    "stateRoot" : "0xd281cb4a35c0fd487330a2ec298313f27a9a37e6a0e9da55aad88d01928a55ef",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc9980066761fb7a6502e227077a05c07a726137b9fce41cada3e04c4f57ac99f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d281cb4a35c0fd487330a2ec298313f27a9a37e6a0e9da55aad88d01928a55efa0c9980066761fb7a6502e227077a05c07a726137b9fce41cada3e04c4f57ac99fa0decd48a1b2602b3c347497cef156b94fa0682ee16b3c347f3cf36ea063be4da3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301058b8203e880a0238d04fe386a5e05bfdf4a24088c23d51cd5abb6e2ce396cee260693681a28ee88cab02ab25c932155f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca030040273c49735e5144b1bd19cbb76d36172d15ad81ae28eb1ee9a8bf6f0fc64a05ab73b1dc50791d509dde59c01e4a763de6b78c1430e627f3bfd919705369ef0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
+                        "gasLimit" : "0x0c3500",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x30040273c49735e5144b1bd19cbb76d36172d15ad81ae28eb1ee9a8bf6f0fc64",
+                        "s" : "0x5ab73b1dc50791d509dde59c01e4a763de6b78c1430e627f3bfd919705369ef0",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2db9a7144825a870e21f638501108b7fcecedeb0c11f22ab41ef888cf39a28b6",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5058b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x726576657274206d657373616765"
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa500000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa600000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a40a75",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa500000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa600000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeReturn_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -203,9 +408,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c6ab",
-                    "hash" : "0x03bb674013d5b2d040b3fb746b1714862d9fff6f802fcb26ba2874272bf9805a",
-                    "mixHash" : "0xaa79aad935ee7208508bd115e847e30e5880d588a24c7b33cd2e38e1f3e586b6",
-                    "nonce" : "0xbec4c6f52ca9cd16",
+                    "hash" : "0x915b0996a77d5bc12577edef8712864cd84bcec72e379b730090a772004c46b9",
+                    "mixHash" : "0x4bdc466399d8e29ac09e33bb4d18fa238857cc36538d459342f03ecf56158198",
+                    "nonce" : "0x3f4aa125063a1684",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
                     "receiptTrie" : "0xc37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497",
@@ -214,7 +419,7 @@
                     "transactionsTrie" : "0xc9980066761fb7a6502e227077a05c07a726137b9fce41cada3e04c4f57ac99f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0a0c9980066761fb7a6502e227077a05c07a726137b9fce41cada3e04c4f57ac99fa0c37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a0aa79aad935ee7208508bd115e847e30e5880d588a24c7b33cd2e38e1f3e586b688bec4c6f52ca9cd16f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca030040273c49735e5144b1bd19cbb76d36172d15ad81ae28eb1ee9a8bf6f0fc64a05ab73b1dc50791d509dde59c01e4a763de6b78c1430e627f3bfd919705369ef0c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0a0c9980066761fb7a6502e227077a05c07a726137b9fce41cada3e04c4f57ac99fa0c37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a04bdc466399d8e29ac09e33bb4d18fa238857cc36538d459342f03ecf56158198883f4aa125063a1684f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca030040273c49735e5144b1bd19cbb76d36172d15ad81ae28eb1ee9a8bf6f0fc64a05ab73b1dc50791d509dde59c01e4a763de6b78c1430e627f3bfd919705369ef0c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -251,8 +456,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x03bb674013d5b2d040b3fb746b1714862d9fff6f802fcb26ba2874272bf9805a",
-        "network" : "EIP158",
+        "lastblockhash" : "0x915b0996a77d5bc12577edef8712864cd84bcec72e379b730090a772004c46b9",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c6ab",
@@ -377,10 +582,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d0g0v0_Frontier" : {
+    "RevertOpcodeReturn_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/stRevertTest/RevertOpcodeReturn_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -391,19 +596,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x02c417",
-                    "hash" : "0xccc270e80f39461057ee146ccbcbc386a9bd57d96ecd2bf67fcd0285d6978e2d",
-                    "mixHash" : "0x3eef054c3ac095f15d465d2c99519ed88e97100fdb75d637f88080d2bb865d8a",
-                    "nonce" : "0xb7741830e8c0c87e",
+                    "gasUsed" : "0x02c6ab",
+                    "hash" : "0x4bf9214418c5ad5cc91db47da24df8fef170651aa27e9c188b35b66eed288c4e",
+                    "mixHash" : "0xdbf396c2865324827f6e0de037a1284686c2804c5cbba1144ab3cdecbc9ecd76",
+                    "nonce" : "0x0ff53431e0e9d223",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0xf0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73b",
-                    "stateRoot" : "0x341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15f",
+                    "receiptTrie" : "0xc37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497",
+                    "stateRoot" : "0x5a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9980066761fb7a6502e227077a05c07a726137b9fce41cada3e04c4f57ac99f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15fa0c9980066761fb7a6502e227077a05c07a726137b9fce41cada3e04c4f57ac99fa0f0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c4178203e880a03eef054c3ac095f15d465d2c99519ed88e97100fdb75d637f88080d2bb865d8a88b7741830e8c0c87ef882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca030040273c49735e5144b1bd19cbb76d36172d15ad81ae28eb1ee9a8bf6f0fc64a05ab73b1dc50791d509dde59c01e4a763de6b78c1430e627f3bfd919705369ef0c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0a0c9980066761fb7a6502e227077a05c07a726137b9fce41cada3e04c4f57ac99fa0c37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a0dbf396c2865324827f6e0de037a1284686c2804c5cbba1144ab3cdecbc9ecd76880ff53431e0e9d223f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca030040273c49735e5144b1bd19cbb76d36172d15ad81ae28eb1ee9a8bf6f0fc64a05ab73b1dc50791d509dde59c01e4a763de6b78c1430e627f3bfd919705369ef0c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -440,11 +645,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xccc270e80f39461057ee146ccbcbc386a9bd57d96ecd2bf67fcd0285d6978e2d",
-        "network" : "Frontier",
+        "lastblockhash" : "0x4bf9214418c5ad5cc91db47da24df8fef170651aa27e9c188b35b66eed288c4e",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f6c417",
+                "balance" : "0x4563918244f6c6ab",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -500,7 +705,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a24be9",
+                "balance" : "0xe8d4a24955",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -566,10 +771,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d0g0v0_Homestead" : {
+    "RevertOpcodeReturn_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/stRevertTest/RevertOpcodeReturn_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -581,9 +786,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c417",
-                    "hash" : "0x5c8dcef9223e834db0a2405d9856e6dd3e0582bac7c93a0e0c612223a6ed6e6b",
-                    "mixHash" : "0x31c6bfe6b44743db4fdb07f3d29e14e2dc81c6d4d8a1887625f3c7e80a9a5f68",
-                    "nonce" : "0x8cbe406111890dce",
+                    "hash" : "0xb9715bb083c33c92dfbfb35e760b1777200938dec056de507e6e26b2c5d384f9",
+                    "mixHash" : "0x85b47622998c043c97f49c07291c34578962a5f4a121e063fa028627ff262b00",
+                    "nonce" : "0x9e6fed86892a74b4",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
                     "receiptTrie" : "0xf0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73b",
@@ -592,7 +797,7 @@
                     "transactionsTrie" : "0xc9980066761fb7a6502e227077a05c07a726137b9fce41cada3e04c4f57ac99f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15fa0c9980066761fb7a6502e227077a05c07a726137b9fce41cada3e04c4f57ac99fa0f0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c4178203e880a031c6bfe6b44743db4fdb07f3d29e14e2dc81c6d4d8a1887625f3c7e80a9a5f68888cbe406111890dcef882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca030040273c49735e5144b1bd19cbb76d36172d15ad81ae28eb1ee9a8bf6f0fc64a05ab73b1dc50791d509dde59c01e4a763de6b78c1430e627f3bfd919705369ef0c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15fa0c9980066761fb7a6502e227077a05c07a726137b9fce41cada3e04c4f57ac99fa0f0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c4178203e880a085b47622998c043c97f49c07291c34578962a5f4a121e063fa028627ff262b00889e6fed86892a74b4f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca030040273c49735e5144b1bd19cbb76d36172d15ad81ae28eb1ee9a8bf6f0fc64a05ab73b1dc50791d509dde59c01e4a763de6b78c1430e627f3bfd919705369ef0c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -629,8 +834,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5c8dcef9223e834db0a2405d9856e6dd3e0582bac7c93a0e0c612223a6ed6e6b",
-        "network" : "Homestead",
+        "lastblockhash" : "0xb9715bb083c33c92dfbfb35e760b1777200938dec056de507e6e26b2c5d384f9",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c417",
@@ -755,10 +960,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d0g0v0_Metropolis" : {
+    "RevertOpcodeReturn_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -769,19 +974,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01058b",
-                    "hash" : "0xc819908a74c6d1eaa0de89ca443eb9ab4df98aba81d85a38a1623dbd7e5c9b15",
-                    "mixHash" : "0x6d2f99711a8caf0448e1c3c053edb78b4fb4a325013ff8a2eb474ae775c4254e",
-                    "nonce" : "0x5cda8d87958ba626",
+                    "gasUsed" : "0x02c417",
+                    "hash" : "0x27972b3c27d0be584ee173ff16a9dd8ae46318e1f70500baad828946ff40cadf",
+                    "mixHash" : "0xf275b8cec93989094442672a91b7ddbba8040a1ff6b71dc0f680b72dde03debd",
+                    "nonce" : "0x28df8431ec32e925",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0xdecd48a1b2602b3c347497cef156b94fa0682ee16b3c347f3cf36ea063be4da3",
-                    "stateRoot" : "0xd281cb4a35c0fd487330a2ec298313f27a9a37e6a0e9da55aad88d01928a55ef",
+                    "receiptTrie" : "0xf0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73b",
+                    "stateRoot" : "0x341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9980066761fb7a6502e227077a05c07a726137b9fce41cada3e04c4f57ac99f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d281cb4a35c0fd487330a2ec298313f27a9a37e6a0e9da55aad88d01928a55efa0c9980066761fb7a6502e227077a05c07a726137b9fce41cada3e04c4f57ac99fa0decd48a1b2602b3c347497cef156b94fa0682ee16b3c347f3cf36ea063be4da3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301058b8203e880a06d2f99711a8caf0448e1c3c053edb78b4fb4a325013ff8a2eb474ae775c4254e885cda8d87958ba626f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca030040273c49735e5144b1bd19cbb76d36172d15ad81ae28eb1ee9a8bf6f0fc64a05ab73b1dc50791d509dde59c01e4a763de6b78c1430e627f3bfd919705369ef0c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15fa0c9980066761fb7a6502e227077a05c07a726137b9fce41cada3e04c4f57ac99fa0f0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c4178203e880a0f275b8cec93989094442672a91b7ddbba8040a1ff6b71dc0f680b72dde03debd8828df8431ec32e925f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca030040273c49735e5144b1bd19cbb76d36172d15ad81ae28eb1ee9a8bf6f0fc64a05ab73b1dc50791d509dde59c01e4a763de6b78c1430e627f3bfd919705369ef0c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -818,18 +1023,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc819908a74c6d1eaa0de89ca443eb9ab4df98aba81d85a38a1623dbd7e5c9b15",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x27972b3c27d0be584ee173ff16a9dd8ae46318e1f70500baad828946ff40cadf",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5058b",
+                "balance" : "0x4563918244f6c417",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -840,7 +1038,6 @@
                 "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x02" : "0x726576657274206d657373616765"
                 }
             },
             "0xa100000000000000000000000000000000000000" : {
@@ -886,7 +1083,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a40a75",
+                "balance" : "0xe8d4a24be9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d0g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d0g1v0.json
index 0381bdf78..3cca43b47 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeReturn_d0g1v0_EIP150" : {
+    "RevertOpcodeReturn_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x011170",
-                    "hash" : "0x6dc7ffb6f0388d949a6fa2f1efa5407ef68101b7c1a31cfd5f290d7262ca5f11",
-                    "mixHash" : "0x7f771b3c5cb4a3899127f8afe3446e2f01ab6996a26023fc8fca1b55959098f6",
-                    "nonce" : "0x90341484496212dc",
+                    "gasUsed" : "0x01058b",
+                    "hash" : "0xb9a78d725d76e5c1f47bba0a857814e626c67365ed01e2101a6836fceefa1484",
+                    "mixHash" : "0x0188fc46d0acd1ea5a5b23beee2eeac156055f403feee1e4617ec0733008c12d",
+                    "nonce" : "0xb0db1a62676e668f",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
-                    "stateRoot" : "0xfcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660f",
+                    "receiptTrie" : "0xdecd48a1b2602b3c347497cef156b94fa0682ee16b3c347f3cf36ea063be4da3",
+                    "stateRoot" : "0xd281cb4a35c0fd487330a2ec298313f27a9a37e6a0e9da55aad88d01928a55ef",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb4a9fcfb2b7778f528bd7c40c57ac2282a72143863ddd1a44df0d1a405767ab2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0b4a9fcfb2b7778f528bd7c40c57ac2282a72143863ddd1a44df0d1a405767ab2a00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a07f771b3c5cb4a3899127f8afe3446e2f01ab6996a26023fc8fca1b55959098f68890341484496212dcf882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca011909d0f080d5eb05f73c007e1967382b1f9d01bf00e12dd2d6ded67b52cfc47a07aa6674504a9748e540e5adae4e212a1990c0adb8b1d460f8a9759da167fefa4c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d281cb4a35c0fd487330a2ec298313f27a9a37e6a0e9da55aad88d01928a55efa0b4a9fcfb2b7778f528bd7c40c57ac2282a72143863ddd1a44df0d1a405767ab2a0decd48a1b2602b3c347497cef156b94fa0682ee16b3c347f3cf36ea063be4da3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301058b8203e880a00188fc46d0acd1ea5a5b23beee2eeac156055f403feee1e4617ec0733008c12d88b0db1a62676e668ff882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca011909d0f080d5eb05f73c007e1967382b1f9d01bf00e12dd2d6ded67b52cfc47a07aa6674504a9748e540e5adae4e212a1990c0adb8b1d460f8a9759da167fefa4c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6dc7ffb6f0388d949a6fa2f1efa5407ef68101b7c1a31cfd5f290d7262ca5f11",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb9a78d725d76e5c1f47bba0a857814e626c67365ed01e2101a6836fceefa1484",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51170",
+                "balance" : "0x4563918244f5058b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -77,6 +84,7 @@
                 "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x02" : "0x726576657274206d657373616765"
                 }
             },
             "0xa100000000000000000000000000000000000000" : {
@@ -122,7 +130,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3fe90",
+                "balance" : "0xe8d4a40a75",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -188,10 +196,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d0g1v0_EIP158" : {
+    "RevertOpcodeReturn_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -202,19 +210,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x011170",
-                    "hash" : "0xfc59dc0c92f4772346f5c9d5b39a56d745c3e3b70f730119954b43fe18dde0c9",
-                    "mixHash" : "0x925ff2fee725eedade39ce7040b1d3b972c4c1cd51bfcb5a8eb959f51766a5a3",
-                    "nonce" : "0xbfe44905e6f52471",
+                    "gasUsed" : "0x01058b",
+                    "hash" : "0x9a9f1019383a87e7e9d7044d0641a6da8e03233c31ec86ca639a05054df97e59",
+                    "mixHash" : "0x674e2cd799e0eb12e4ed58e3212c06db77ed6c659353332229f1bffaddc043af",
+                    "nonce" : "0xc8e8e8ab1f57e7e8",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
-                    "stateRoot" : "0xfcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660f",
+                    "receiptTrie" : "0xdecd48a1b2602b3c347497cef156b94fa0682ee16b3c347f3cf36ea063be4da3",
+                    "stateRoot" : "0xd281cb4a35c0fd487330a2ec298313f27a9a37e6a0e9da55aad88d01928a55ef",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb4a9fcfb2b7778f528bd7c40c57ac2282a72143863ddd1a44df0d1a405767ab2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0b4a9fcfb2b7778f528bd7c40c57ac2282a72143863ddd1a44df0d1a405767ab2a00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0925ff2fee725eedade39ce7040b1d3b972c4c1cd51bfcb5a8eb959f51766a5a388bfe44905e6f52471f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca011909d0f080d5eb05f73c007e1967382b1f9d01bf00e12dd2d6ded67b52cfc47a07aa6674504a9748e540e5adae4e212a1990c0adb8b1d460f8a9759da167fefa4c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d281cb4a35c0fd487330a2ec298313f27a9a37e6a0e9da55aad88d01928a55efa0b4a9fcfb2b7778f528bd7c40c57ac2282a72143863ddd1a44df0d1a405767ab2a0decd48a1b2602b3c347497cef156b94fa0682ee16b3c347f3cf36ea063be4da3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301058b8203e880a0674e2cd799e0eb12e4ed58e3212c06db77ed6c659353332229f1bffaddc043af88c8e8e8ab1f57e7e8f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca011909d0f080d5eb05f73c007e1967382b1f9d01bf00e12dd2d6ded67b52cfc47a07aa6674504a9748e540e5adae4e212a1990c0adb8b1d460f8a9759da167fefa4c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -251,11 +259,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfc59dc0c92f4772346f5c9d5b39a56d745c3e3b70f730119954b43fe18dde0c9",
-        "network" : "EIP158",
+        "lastblockhash" : "0x9a9f1019383a87e7e9d7044d0641a6da8e03233c31ec86ca639a05054df97e59",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51170",
+                "balance" : "0x4563918244f5058b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -266,6 +281,7 @@
                 "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x02" : "0x726576657274206d657373616765"
                 }
             },
             "0xa100000000000000000000000000000000000000" : {
@@ -311,7 +327,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3fe90",
+                "balance" : "0xe8d4a40a75",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -377,10 +393,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d0g1v0_Frontier" : {
+    "RevertOpcodeReturn_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -392,9 +408,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0xc0ae1e41b98becf10a9041e9be8084546770949482d522237f86a45689c07ee5",
-                    "mixHash" : "0xb0db940be19a45a1531e7e70cceb1726c0ce990af02402e0c6a02960c2f09384",
-                    "nonce" : "0x96ec065a7b32e698",
+                    "hash" : "0xfd7e298de6e05fa96ecf610db53375e64a485ddadd54126c56af682f0c294705",
+                    "mixHash" : "0x54e2e775206f773cf2b40b6f7e8f9e31855fd61059031ed2ec52470617145e27",
+                    "nonce" : "0x3959141e711e54c8",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
                     "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
@@ -403,7 +419,7 @@
                     "transactionsTrie" : "0xb4a9fcfb2b7778f528bd7c40c57ac2282a72143863ddd1a44df0d1a405767ab2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0b4a9fcfb2b7778f528bd7c40c57ac2282a72143863ddd1a44df0d1a405767ab2a00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0b0db940be19a45a1531e7e70cceb1726c0ce990af02402e0c6a02960c2f093848896ec065a7b32e698f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca011909d0f080d5eb05f73c007e1967382b1f9d01bf00e12dd2d6ded67b52cfc47a07aa6674504a9748e540e5adae4e212a1990c0adb8b1d460f8a9759da167fefa4c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0b4a9fcfb2b7778f528bd7c40c57ac2282a72143863ddd1a44df0d1a405767ab2a00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a054e2e775206f773cf2b40b6f7e8f9e31855fd61059031ed2ec52470617145e27883959141e711e54c8f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca011909d0f080d5eb05f73c007e1967382b1f9d01bf00e12dd2d6ded67b52cfc47a07aa6674504a9748e540e5adae4e212a1990c0adb8b1d460f8a9759da167fefa4c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -440,8 +456,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc0ae1e41b98becf10a9041e9be8084546770949482d522237f86a45689c07ee5",
-        "network" : "Frontier",
+        "lastblockhash" : "0xfd7e298de6e05fa96ecf610db53375e64a485ddadd54126c56af682f0c294705",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51170",
@@ -566,10 +582,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d0g1v0_Homestead" : {
+    "RevertOpcodeReturn_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -581,9 +597,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0x1f34e2c44d508e5990f387612904f57eae186a9a9666cf0a76a500c233e0a62d",
-                    "mixHash" : "0x08061cf5ed3730369c74cbe5235535893a3a66f2a535732b8f6138be932912d2",
-                    "nonce" : "0xfe9533df120f5213",
+                    "hash" : "0x0cecf2cf29970dcbdbbe346133bbf3db11c03dd2e389de04c3478b7806ac55a1",
+                    "mixHash" : "0x8cc2fce9b936e0bafdf4de0cee101dbf733a34fe7c17027b9247bbed5a251f71",
+                    "nonce" : "0xbc9ace2869464290",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
                     "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
@@ -592,7 +608,7 @@
                     "transactionsTrie" : "0xb4a9fcfb2b7778f528bd7c40c57ac2282a72143863ddd1a44df0d1a405767ab2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0b4a9fcfb2b7778f528bd7c40c57ac2282a72143863ddd1a44df0d1a405767ab2a00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a008061cf5ed3730369c74cbe5235535893a3a66f2a535732b8f6138be932912d288fe9533df120f5213f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca011909d0f080d5eb05f73c007e1967382b1f9d01bf00e12dd2d6ded67b52cfc47a07aa6674504a9748e540e5adae4e212a1990c0adb8b1d460f8a9759da167fefa4c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0b4a9fcfb2b7778f528bd7c40c57ac2282a72143863ddd1a44df0d1a405767ab2a00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a08cc2fce9b936e0bafdf4de0cee101dbf733a34fe7c17027b9247bbed5a251f7188bc9ace2869464290f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca011909d0f080d5eb05f73c007e1967382b1f9d01bf00e12dd2d6ded67b52cfc47a07aa6674504a9748e540e5adae4e212a1990c0adb8b1d460f8a9759da167fefa4c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -629,8 +645,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1f34e2c44d508e5990f387612904f57eae186a9a9666cf0a76a500c233e0a62d",
-        "network" : "Homestead",
+        "lastblockhash" : "0x0cecf2cf29970dcbdbbe346133bbf3db11c03dd2e389de04c3478b7806ac55a1",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51170",
@@ -755,10 +771,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d0g1v0_Metropolis" : {
+    "RevertOpcodeReturn_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -769,19 +785,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01058b",
-                    "hash" : "0xd196b0d7657eef3f83849d4d1d03b593af756da01b31072aefba4b735ad37a77",
-                    "mixHash" : "0x29c4e30a65d41b9b1ac7b7d6f70687d82fb644cce02ae207ed978565e693a574",
-                    "nonce" : "0x4ac41b478de2a821",
+                    "gasUsed" : "0x011170",
+                    "hash" : "0xab82a221a6a5405b9b8ac55dbfd09fe4957cf2f39c06e011941d17993d1283ec",
+                    "mixHash" : "0x43219444c9767e12bc2d30b7668dcea291aa4120a6d7576486ad310ac6f945df",
+                    "nonce" : "0x69a73ebb334e3f4d",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0xdecd48a1b2602b3c347497cef156b94fa0682ee16b3c347f3cf36ea063be4da3",
-                    "stateRoot" : "0xd281cb4a35c0fd487330a2ec298313f27a9a37e6a0e9da55aad88d01928a55ef",
+                    "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
+                    "stateRoot" : "0xfcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb4a9fcfb2b7778f528bd7c40c57ac2282a72143863ddd1a44df0d1a405767ab2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d281cb4a35c0fd487330a2ec298313f27a9a37e6a0e9da55aad88d01928a55efa0b4a9fcfb2b7778f528bd7c40c57ac2282a72143863ddd1a44df0d1a405767ab2a0decd48a1b2602b3c347497cef156b94fa0682ee16b3c347f3cf36ea063be4da3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301058b8203e880a029c4e30a65d41b9b1ac7b7d6f70687d82fb644cce02ae207ed978565e693a574884ac41b478de2a821f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca011909d0f080d5eb05f73c007e1967382b1f9d01bf00e12dd2d6ded67b52cfc47a07aa6674504a9748e540e5adae4e212a1990c0adb8b1d460f8a9759da167fefa4c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0b4a9fcfb2b7778f528bd7c40c57ac2282a72143863ddd1a44df0d1a405767ab2a00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a043219444c9767e12bc2d30b7668dcea291aa4120a6d7576486ad310ac6f945df8869a73ebb334e3f4df882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca011909d0f080d5eb05f73c007e1967382b1f9d01bf00e12dd2d6ded67b52cfc47a07aa6674504a9748e540e5adae4e212a1990c0adb8b1d460f8a9759da167fefa4c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
@@ -818,18 +834,200 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd196b0d7657eef3f83849d4d1d03b593af756da01b31072aefba4b735ad37a77",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xab82a221a6a5405b9b8ac55dbfd09fe4957cf2f39c06e011941d17993d1283ec",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f51170",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa500000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa600000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3fe90",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa500000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa600000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeReturn_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x011170",
+                    "hash" : "0x30a288e62492b1a2ad3acbba05c2bf2ece8447dddeb120996d7199ca08b60e6d",
+                    "mixHash" : "0xf65a9a528e1a55589e56e95bc826cc7ed6da4e4bd64c679dca62a846112d253a",
+                    "nonce" : "0x97d9955d41f4c425",
+                    "number" : "0x01",
+                    "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
+                    "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
+                    "stateRoot" : "0xfcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb4a9fcfb2b7778f528bd7c40c57ac2282a72143863ddd1a44df0d1a405767ab2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0b4a9fcfb2b7778f528bd7c40c57ac2282a72143863ddd1a44df0d1a405767ab2a00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0f65a9a528e1a55589e56e95bc826cc7ed6da4e4bd64c679dca62a846112d253a8897d9955d41f4c425f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a1000000000000000000000000000000000000001ca011909d0f080d5eb05f73c007e1967382b1f9d01bf00e12dd2d6ded67b52cfc47a07aa6674504a9748e540e5adae4e212a1990c0adb8b1d460f8a9759da167fefa4c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a100000000000000000000000000000000000000",
+                        "gasLimit" : "0x011170",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x11909d0f080d5eb05f73c007e1967382b1f9d01bf00e12dd2d6ded67b52cfc47",
+                        "s" : "0x7aa6674504a9748e540e5adae4e212a1990c0adb8b1d460f8a9759da167fefa4",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x30a288e62492b1a2ad3acbba05c2bf2ece8447dddeb120996d7199ca08b60e6d",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5058b",
+                "balance" : "0x4563918244f51170",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -840,7 +1038,6 @@
                 "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x02" : "0x726576657274206d657373616765"
                 }
             },
             "0xa100000000000000000000000000000000000000" : {
@@ -886,7 +1083,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a40a75",
+                "balance" : "0xe8d4a3fe90",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d1g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d1g0v0.json
index 1507fc353..4452fa020 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d1g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d1g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeReturn_d1g0v0_EIP150" : {
+    "RevertOpcodeReturn_d1g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x02c6ab",
-                    "hash" : "0x255f79181ab4b347f08b5ef1ffc6e131a9760aeff5eaf5cebe17f70153fe5451",
-                    "mixHash" : "0x34fbd1f2659a2cdfb2c7163f0939f776db813e76680e75fa9773c6ca4bdf0625",
-                    "nonce" : "0x2ee0380fb383256b",
+                    "gasUsed" : "0xcaf3",
+                    "hash" : "0x4b9856be7d2fae28cfb11020fe3b5e8943b8ecc6cb10a3b1dde2c86d9e870382",
+                    "mixHash" : "0xea3cd2d97778c44079645d5e46ddf46d2af56b51f9b574f6f0a176c8d6e43d6d",
+                    "nonce" : "0xbc47632b40e0ca42",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0xc37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497",
-                    "stateRoot" : "0x5a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0",
+                    "receiptTrie" : "0x018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7",
+                    "stateRoot" : "0x3ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb66c8ce5ba315d60bc706c42cf3d873dbc5663d17cc04cb8bd07326384bfb6d1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0a0b66c8ce5ba315d60bc706c42cf3d873dbc5663d17cc04cb8bd07326384bfb6d1a0c37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a034fbd1f2659a2cdfb2c7163f0939f776db813e76680e75fa9773c6ca4bdf0625882ee0380fb383256bf882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca08f128b96c378060b658c55a77e7ab0f41ede42aebc1361b230bce68496e40a5ea03e7b9bab791f8c96214613d10848aaedb1044fb390d6dcde030915e64b9d0f94c0",
+                "rlp" : "0xf9027ff901f7a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8a0b66c8ce5ba315d60bc706c42cf3d873dbc5663d17cc04cb8bd07326384bfb6d1a0018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082caf38203e880a0ea3cd2d97778c44079645d5e46ddf46d2af56b51f9b574f6f0a176c8d6e43d6d88bc47632b40e0ca42f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca08f128b96c378060b658c55a77e7ab0f41ede42aebc1361b230bce68496e40a5ea03e7b9bab791f8c96214613d10848aaedb1044fb390d6dcde030915e64b9d0f94c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x255f79181ab4b347f08b5ef1ffc6e131a9760aeff5eaf5cebe17f70153fe5451",
-        "network" : "EIP150",
+        "lastblockhash" : "0x4b9856be7d2fae28cfb11020fe3b5e8943b8ecc6cb10a3b1dde2c86d9e870382",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f6c6ab",
+                "balance" : "0x4563918244f4caf3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -122,7 +129,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a24955",
+                "balance" : "0xe8d4a4450d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -188,10 +195,206 @@
             }
         }
     },
-    "RevertOpcodeReturn_d1g0v0_EIP158" : {
+    "RevertOpcodeReturn_d1g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d1g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xcaf3",
+                    "hash" : "0x8a24d26367d045d4411a74d979186c47f7eed4fa7982355b1ef57dca73f059c2",
+                    "mixHash" : "0x3eba2eba1e9b0418d828fd2068838292b7615249e7dbf00e29afa81bbf89df34",
+                    "nonce" : "0x423029ececcbd33d",
+                    "number" : "0x01",
+                    "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
+                    "receiptTrie" : "0x018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7",
+                    "stateRoot" : "0x3ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb66c8ce5ba315d60bc706c42cf3d873dbc5663d17cc04cb8bd07326384bfb6d1",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9027ff901f7a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8a0b66c8ce5ba315d60bc706c42cf3d873dbc5663d17cc04cb8bd07326384bfb6d1a0018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082caf38203e880a03eba2eba1e9b0418d828fd2068838292b7615249e7dbf00e29afa81bbf89df3488423029ececcbd33df882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca08f128b96c378060b658c55a77e7ab0f41ede42aebc1361b230bce68496e40a5ea03e7b9bab791f8c96214613d10848aaedb1044fb390d6dcde030915e64b9d0f94c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
+                        "gasLimit" : "0x0c3500",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8f128b96c378060b658c55a77e7ab0f41ede42aebc1361b230bce68496e40a5e",
+                        "s" : "0x3e7b9bab791f8c96214613d10848aaedb1044fb390d6dcde030915e64b9d0f94",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8a24d26367d045d4411a74d979186c47f7eed4fa7982355b1ef57dca73f059c2",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4caf3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa500000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa600000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a4450d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa500000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa600000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeReturn_d1g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -203,9 +406,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c6ab",
-                    "hash" : "0x825cf4858239f61f09da876bc43d10ee183db35bd3629ef9359b655030841ea6",
-                    "mixHash" : "0x0c5990dea8ab1f9824b5215892429ab3dbc3f4e6f156f90e8c80f62577138cbb",
-                    "nonce" : "0x01269e711188670c",
+                    "hash" : "0xd99f3c198701d7df57637f8bbd60a5755bdb7136c21a1175c02e05d42b85b9eb",
+                    "mixHash" : "0x4062729626595fa29069726af22ad4a8b2b08d828820eca30285f5acbd6762a3",
+                    "nonce" : "0xe1619aefb1591b71",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
                     "receiptTrie" : "0xc37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497",
@@ -214,7 +417,7 @@
                     "transactionsTrie" : "0xb66c8ce5ba315d60bc706c42cf3d873dbc5663d17cc04cb8bd07326384bfb6d1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0a0b66c8ce5ba315d60bc706c42cf3d873dbc5663d17cc04cb8bd07326384bfb6d1a0c37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a00c5990dea8ab1f9824b5215892429ab3dbc3f4e6f156f90e8c80f62577138cbb8801269e711188670cf882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca08f128b96c378060b658c55a77e7ab0f41ede42aebc1361b230bce68496e40a5ea03e7b9bab791f8c96214613d10848aaedb1044fb390d6dcde030915e64b9d0f94c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0a0b66c8ce5ba315d60bc706c42cf3d873dbc5663d17cc04cb8bd07326384bfb6d1a0c37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a04062729626595fa29069726af22ad4a8b2b08d828820eca30285f5acbd6762a388e1619aefb1591b71f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca08f128b96c378060b658c55a77e7ab0f41ede42aebc1361b230bce68496e40a5ea03e7b9bab791f8c96214613d10848aaedb1044fb390d6dcde030915e64b9d0f94c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -251,8 +454,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x825cf4858239f61f09da876bc43d10ee183db35bd3629ef9359b655030841ea6",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd99f3c198701d7df57637f8bbd60a5755bdb7136c21a1175c02e05d42b85b9eb",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c6ab",
@@ -377,10 +580,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d1g0v0_Frontier" : {
+    "RevertOpcodeReturn_d1g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -391,19 +594,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x02c417",
-                    "hash" : "0x8be788e316efbca6349f648d8c5f5d2d3ff033fa9427def40e4912647d4b89e3",
-                    "mixHash" : "0xc3824513c3c970bf9394ef64343ba76f97c7f715416a34bffcdfc696e3a3a8e1",
-                    "nonce" : "0x8c1eada926e57cf5",
+                    "gasUsed" : "0x02c6ab",
+                    "hash" : "0xb1a5c1aaaeea287ff8ca1524881629f28c8e579148524cba018432d972ba14ce",
+                    "mixHash" : "0x1b5b90e5f0c6b4beee583d0d90a7f4ecff54ae710fa5cdee54aba28889ac649f",
+                    "nonce" : "0x9f21b2631323ea5f",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0xf0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73b",
-                    "stateRoot" : "0x341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15f",
+                    "receiptTrie" : "0xc37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497",
+                    "stateRoot" : "0x5a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb66c8ce5ba315d60bc706c42cf3d873dbc5663d17cc04cb8bd07326384bfb6d1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15fa0b66c8ce5ba315d60bc706c42cf3d873dbc5663d17cc04cb8bd07326384bfb6d1a0f0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c4178203e880a0c3824513c3c970bf9394ef64343ba76f97c7f715416a34bffcdfc696e3a3a8e1888c1eada926e57cf5f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca08f128b96c378060b658c55a77e7ab0f41ede42aebc1361b230bce68496e40a5ea03e7b9bab791f8c96214613d10848aaedb1044fb390d6dcde030915e64b9d0f94c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0a0b66c8ce5ba315d60bc706c42cf3d873dbc5663d17cc04cb8bd07326384bfb6d1a0c37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a01b5b90e5f0c6b4beee583d0d90a7f4ecff54ae710fa5cdee54aba28889ac649f889f21b2631323ea5ff882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca08f128b96c378060b658c55a77e7ab0f41ede42aebc1361b230bce68496e40a5ea03e7b9bab791f8c96214613d10848aaedb1044fb390d6dcde030915e64b9d0f94c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -440,11 +643,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8be788e316efbca6349f648d8c5f5d2d3ff033fa9427def40e4912647d4b89e3",
-        "network" : "Frontier",
+        "lastblockhash" : "0xb1a5c1aaaeea287ff8ca1524881629f28c8e579148524cba018432d972ba14ce",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f6c417",
+                "balance" : "0x4563918244f6c6ab",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -500,7 +703,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a24be9",
+                "balance" : "0xe8d4a24955",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -566,10 +769,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d1g0v0_Homestead" : {
+    "RevertOpcodeReturn_d1g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -581,9 +784,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c417",
-                    "hash" : "0xd94c30bfafba6b83ebf9fdd6ae0abf408435a1716e4aa7247c3fda412b195e52",
-                    "mixHash" : "0x75b79c578958bbd9c1df098d6aa2f0fd76ea0b1ba377a7c9fa6bb6ae8f6f2a04",
-                    "nonce" : "0x988759da3b1d08f8",
+                    "hash" : "0xdc88b663b0b63d7e1e03fa3c18b945e0b1ad697e4a1f11a99ba857a51e9551dd",
+                    "mixHash" : "0x7b86e87d1ec4d03ab18346109700f383b5ebac7a1598b87cb095bfeb99feec27",
+                    "nonce" : "0x62fd4619e1fa585d",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
                     "receiptTrie" : "0xf0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73b",
@@ -592,7 +795,7 @@
                     "transactionsTrie" : "0xb66c8ce5ba315d60bc706c42cf3d873dbc5663d17cc04cb8bd07326384bfb6d1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15fa0b66c8ce5ba315d60bc706c42cf3d873dbc5663d17cc04cb8bd07326384bfb6d1a0f0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c4178203e880a075b79c578958bbd9c1df098d6aa2f0fd76ea0b1ba377a7c9fa6bb6ae8f6f2a0488988759da3b1d08f8f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca08f128b96c378060b658c55a77e7ab0f41ede42aebc1361b230bce68496e40a5ea03e7b9bab791f8c96214613d10848aaedb1044fb390d6dcde030915e64b9d0f94c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15fa0b66c8ce5ba315d60bc706c42cf3d873dbc5663d17cc04cb8bd07326384bfb6d1a0f0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c4178203e880a07b86e87d1ec4d03ab18346109700f383b5ebac7a1598b87cb095bfeb99feec278862fd4619e1fa585df882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca08f128b96c378060b658c55a77e7ab0f41ede42aebc1361b230bce68496e40a5ea03e7b9bab791f8c96214613d10848aaedb1044fb390d6dcde030915e64b9d0f94c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -629,8 +832,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd94c30bfafba6b83ebf9fdd6ae0abf408435a1716e4aa7247c3fda412b195e52",
-        "network" : "Homestead",
+        "lastblockhash" : "0xdc88b663b0b63d7e1e03fa3c18b945e0b1ad697e4a1f11a99ba857a51e9551dd",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c417",
@@ -755,10 +958,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d1g0v0_Metropolis" : {
+    "RevertOpcodeReturn_d1g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -769,19 +972,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xcaf3",
-                    "hash" : "0x1224dfd6ca4fddfd4b82a81f994302b9f838e8fd80a63ce5e5ba505b3ff26106",
-                    "mixHash" : "0xc86bef92a344d0c541a59daa7087f7068047d06575ee8183471991d781b7b69c",
-                    "nonce" : "0xf9b5cb09b11b9265",
+                    "gasUsed" : "0x02c417",
+                    "hash" : "0xd8d615e63901da917b72b335a517b7de195a78072f393adafe1f09d6a8b3dcb8",
+                    "mixHash" : "0x6660b1ab45af705e93ceb07b776c202f5797ed2e6a4e36f171c865da4896eee7",
+                    "nonce" : "0xc6321d54e9c5659d",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0x018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7",
-                    "stateRoot" : "0x3ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8",
+                    "receiptTrie" : "0xf0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73b",
+                    "stateRoot" : "0x341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb66c8ce5ba315d60bc706c42cf3d873dbc5663d17cc04cb8bd07326384bfb6d1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8a0b66c8ce5ba315d60bc706c42cf3d873dbc5663d17cc04cb8bd07326384bfb6d1a0018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082caf38203e880a0c86bef92a344d0c541a59daa7087f7068047d06575ee8183471991d781b7b69c88f9b5cb09b11b9265f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca08f128b96c378060b658c55a77e7ab0f41ede42aebc1361b230bce68496e40a5ea03e7b9bab791f8c96214613d10848aaedb1044fb390d6dcde030915e64b9d0f94c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15fa0b66c8ce5ba315d60bc706c42cf3d873dbc5663d17cc04cb8bd07326384bfb6d1a0f0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c4178203e880a06660b1ab45af705e93ceb07b776c202f5797ed2e6a4e36f171c865da4896eee788c6321d54e9c5659df882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca08f128b96c378060b658c55a77e7ab0f41ede42aebc1361b230bce68496e40a5ea03e7b9bab791f8c96214613d10848aaedb1044fb390d6dcde030915e64b9d0f94c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -818,18 +1021,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1224dfd6ca4fddfd4b82a81f994302b9f838e8fd80a63ce5e5ba505b3ff26106",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd8d615e63901da917b72b335a517b7de195a78072f393adafe1f09d6a8b3dcb8",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4caf3",
+                "balance" : "0x4563918244f6c417",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -885,7 +1081,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a4450d",
+                "balance" : "0xe8d4a24be9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d1g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d1g1v0.json
index 0579fc164..99c2dc0bf 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d1g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d1g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeReturn_d1g1v0_EIP150" : {
+    "RevertOpcodeReturn_d1g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x011170",
-                    "hash" : "0xf2d83c1326ccf6ff88221fc34c5ef3d036af0bea757b687d01e9515860d3b0a2",
-                    "mixHash" : "0x576a3f0d456494720eecf89d256cc949a49ca85d9b36997ba92b65817142701c",
-                    "nonce" : "0xcba1b63b7aa8aa01",
+                    "gasUsed" : "0xcaf3",
+                    "hash" : "0x2a27fdf4955d780e1103b0d6fb4a790311b88d702f395e274366de3238b2e0fe",
+                    "mixHash" : "0x6e8df47f79cb55d29a4a04c829bbeacc78c3d56e70a532640d14f3974dff3c50",
+                    "nonce" : "0x7fdc1692043c2cd0",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
-                    "stateRoot" : "0xfcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660f",
+                    "receiptTrie" : "0x018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7",
+                    "stateRoot" : "0x3ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xec4c6e46f2c1de8fd7e409b736987d61f3337a5df436f64328b46e963712856d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0ec4c6e46f2c1de8fd7e409b736987d61f3337a5df436f64328b46e963712856da00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0576a3f0d456494720eecf89d256cc949a49ca85d9b36997ba92b65817142701c88cba1b63b7aa8aa01f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca0f90a42bc2ca374b02460c8b21dad07c40c70a84732dc76c91b0bb4045f8b59f7a03c926786943ae0abf73a76ff6e17b966fe580875ea58a6f71063c88e7605ea13c0",
+                "rlp" : "0xf9027ff901f7a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8a0ec4c6e46f2c1de8fd7e409b736987d61f3337a5df436f64328b46e963712856da0018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082caf38203e880a06e8df47f79cb55d29a4a04c829bbeacc78c3d56e70a532640d14f3974dff3c50887fdc1692043c2cd0f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca0f90a42bc2ca374b02460c8b21dad07c40c70a84732dc76c91b0bb4045f8b59f7a03c926786943ae0abf73a76ff6e17b966fe580875ea58a6f71063c88e7605ea13c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf2d83c1326ccf6ff88221fc34c5ef3d036af0bea757b687d01e9515860d3b0a2",
-        "network" : "EIP150",
+        "lastblockhash" : "0x2a27fdf4955d780e1103b0d6fb4a790311b88d702f395e274366de3238b2e0fe",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51170",
+                "balance" : "0x4563918244f4caf3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -122,7 +129,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3fe90",
+                "balance" : "0xe8d4a4450d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -188,10 +195,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d1g1v0_EIP158" : {
+    "RevertOpcodeReturn_d1g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -202,19 +209,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x011170",
-                    "hash" : "0x3c80f6210b64e9eaf2858a787e28840286cd02c05b3fef4d13ce01a86c6b1cb0",
-                    "mixHash" : "0x867f3bb337a6989cd902453d884dae5372e2c5f39f15a11dc5e9bb691f7f60d5",
-                    "nonce" : "0x08b006d8052bae80",
+                    "gasUsed" : "0xcaf3",
+                    "hash" : "0x1b61ade54d7c684a083803b34ddf5b0ce38bfda7479c4400f4b675fee941f6bd",
+                    "mixHash" : "0x1a418a848012ed552da3375802c6e8abc959e95daf58c474f6708604599c7bc3",
+                    "nonce" : "0x3f9c31ca9679fa3f",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
-                    "stateRoot" : "0xfcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660f",
+                    "receiptTrie" : "0x018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7",
+                    "stateRoot" : "0x3ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xec4c6e46f2c1de8fd7e409b736987d61f3337a5df436f64328b46e963712856d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0ec4c6e46f2c1de8fd7e409b736987d61f3337a5df436f64328b46e963712856da00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0867f3bb337a6989cd902453d884dae5372e2c5f39f15a11dc5e9bb691f7f60d58808b006d8052bae80f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca0f90a42bc2ca374b02460c8b21dad07c40c70a84732dc76c91b0bb4045f8b59f7a03c926786943ae0abf73a76ff6e17b966fe580875ea58a6f71063c88e7605ea13c0",
+                "rlp" : "0xf9027ff901f7a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8a0ec4c6e46f2c1de8fd7e409b736987d61f3337a5df436f64328b46e963712856da0018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082caf38203e880a01a418a848012ed552da3375802c6e8abc959e95daf58c474f6708604599c7bc3883f9c31ca9679fa3ff882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca0f90a42bc2ca374b02460c8b21dad07c40c70a84732dc76c91b0bb4045f8b59f7a03c926786943ae0abf73a76ff6e17b966fe580875ea58a6f71063c88e7605ea13c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -251,11 +258,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3c80f6210b64e9eaf2858a787e28840286cd02c05b3fef4d13ce01a86c6b1cb0",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1b61ade54d7c684a083803b34ddf5b0ce38bfda7479c4400f4b675fee941f6bd",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51170",
+                "balance" : "0x4563918244f4caf3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -311,7 +325,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3fe90",
+                "balance" : "0xe8d4a4450d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -377,10 +391,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d1g1v0_Frontier" : {
+    "RevertOpcodeReturn_d1g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -392,9 +406,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0x98c2a56c075545210fc5dbd8f827fee2707f5aa1c897b8502eb38b048c5228d2",
-                    "mixHash" : "0x63ebfd481b4f8c9256275d3286b9b9f9a95a9cca57d63b5f69a8a837c5de1d65",
-                    "nonce" : "0x30201de5baf28253",
+                    "hash" : "0x557a73fdcfcb3d408cd52975b539b50fb2fa52760929851dbe023eae3f814ad6",
+                    "mixHash" : "0x178801d69bd0ce67d2de70d4dbad588d5d20280dde142fd02e2b2b15840d11b7",
+                    "nonce" : "0xe24371f4bf567601",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
                     "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
@@ -403,7 +417,7 @@
                     "transactionsTrie" : "0xec4c6e46f2c1de8fd7e409b736987d61f3337a5df436f64328b46e963712856d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0ec4c6e46f2c1de8fd7e409b736987d61f3337a5df436f64328b46e963712856da00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a063ebfd481b4f8c9256275d3286b9b9f9a95a9cca57d63b5f69a8a837c5de1d658830201de5baf28253f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca0f90a42bc2ca374b02460c8b21dad07c40c70a84732dc76c91b0bb4045f8b59f7a03c926786943ae0abf73a76ff6e17b966fe580875ea58a6f71063c88e7605ea13c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0ec4c6e46f2c1de8fd7e409b736987d61f3337a5df436f64328b46e963712856da00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0178801d69bd0ce67d2de70d4dbad588d5d20280dde142fd02e2b2b15840d11b788e24371f4bf567601f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca0f90a42bc2ca374b02460c8b21dad07c40c70a84732dc76c91b0bb4045f8b59f7a03c926786943ae0abf73a76ff6e17b966fe580875ea58a6f71063c88e7605ea13c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -440,8 +454,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x98c2a56c075545210fc5dbd8f827fee2707f5aa1c897b8502eb38b048c5228d2",
-        "network" : "Frontier",
+        "lastblockhash" : "0x557a73fdcfcb3d408cd52975b539b50fb2fa52760929851dbe023eae3f814ad6",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51170",
@@ -566,10 +580,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d1g1v0_Homestead" : {
+    "RevertOpcodeReturn_d1g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -581,9 +595,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0x2c10f46d8e0baeee6036c62d6f289324794bbd062faba52859633083d5bb8710",
-                    "mixHash" : "0x8c545b6e5979d18867a3c5766ad2a2bbdacd286f29d59a19375bdf8682902068",
-                    "nonce" : "0xd66b6b9daea47feb",
+                    "hash" : "0xe9ee654342e121621bab9306398ea7bb23cb29e622bb44def3fad2e179b2623d",
+                    "mixHash" : "0x1183ac5cf6f7f96eeaf11b67e6c508d62da8028c4530f8494919a556d00e6c70",
+                    "nonce" : "0xd989a9d26b5976e0",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
                     "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
@@ -592,7 +606,7 @@
                     "transactionsTrie" : "0xec4c6e46f2c1de8fd7e409b736987d61f3337a5df436f64328b46e963712856d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0ec4c6e46f2c1de8fd7e409b736987d61f3337a5df436f64328b46e963712856da00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a08c545b6e5979d18867a3c5766ad2a2bbdacd286f29d59a19375bdf868290206888d66b6b9daea47febf882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca0f90a42bc2ca374b02460c8b21dad07c40c70a84732dc76c91b0bb4045f8b59f7a03c926786943ae0abf73a76ff6e17b966fe580875ea58a6f71063c88e7605ea13c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0ec4c6e46f2c1de8fd7e409b736987d61f3337a5df436f64328b46e963712856da00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a01183ac5cf6f7f96eeaf11b67e6c508d62da8028c4530f8494919a556d00e6c7088d989a9d26b5976e0f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca0f90a42bc2ca374b02460c8b21dad07c40c70a84732dc76c91b0bb4045f8b59f7a03c926786943ae0abf73a76ff6e17b966fe580875ea58a6f71063c88e7605ea13c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -629,8 +643,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2c10f46d8e0baeee6036c62d6f289324794bbd062faba52859633083d5bb8710",
-        "network" : "Homestead",
+        "lastblockhash" : "0xe9ee654342e121621bab9306398ea7bb23cb29e622bb44def3fad2e179b2623d",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51170",
@@ -755,10 +769,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d1g1v0_Metropolis" : {
+    "RevertOpcodeReturn_d1g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d1g1v0Filler.json"
         },
         "blocks" : [
@@ -769,19 +783,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xcaf3",
-                    "hash" : "0x6517fabec742e15705bf13b0b0ee744a33786e21eb0c071f916b6c93da48671c",
-                    "mixHash" : "0xed903bb50559ba3e8324d14c0df36dab65cfe39f0e3ccb13b62c7500f2047ae2",
-                    "nonce" : "0x2d4ec8ee12c4a09e",
+                    "gasUsed" : "0x011170",
+                    "hash" : "0xafda26f4ef760d5a2e362cac9334a2553e808de4106f6b387cb13340c77d9583",
+                    "mixHash" : "0x4d3fbfac6da3a333f1200e02ca913877fe2a15ff121a51669089438ff2d8eccf",
+                    "nonce" : "0x8cc7a3f6040e2863",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0x018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7",
-                    "stateRoot" : "0x3ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8",
+                    "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
+                    "stateRoot" : "0xfcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xec4c6e46f2c1de8fd7e409b736987d61f3337a5df436f64328b46e963712856d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8a0ec4c6e46f2c1de8fd7e409b736987d61f3337a5df436f64328b46e963712856da0018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082caf38203e880a0ed903bb50559ba3e8324d14c0df36dab65cfe39f0e3ccb13b62c7500f2047ae2882d4ec8ee12c4a09ef882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca0f90a42bc2ca374b02460c8b21dad07c40c70a84732dc76c91b0bb4045f8b59f7a03c926786943ae0abf73a76ff6e17b966fe580875ea58a6f71063c88e7605ea13c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0ec4c6e46f2c1de8fd7e409b736987d61f3337a5df436f64328b46e963712856da00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a04d3fbfac6da3a333f1200e02ca913877fe2a15ff121a51669089438ff2d8eccf888cc7a3f6040e2863f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca0f90a42bc2ca374b02460c8b21dad07c40c70a84732dc76c91b0bb4045f8b59f7a03c926786943ae0abf73a76ff6e17b966fe580875ea58a6f71063c88e7605ea13c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
@@ -818,18 +832,200 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6517fabec742e15705bf13b0b0ee744a33786e21eb0c071f916b6c93da48671c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xafda26f4ef760d5a2e362cac9334a2553e808de4106f6b387cb13340c77d9583",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f51170",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa500000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa600000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3fe90",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa500000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa600000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeReturn_d1g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d1g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x011170",
+                    "hash" : "0xa844b7789767d9a6bca64261859f3625dbdf9e3837cdd952138ebcf5757ef39e",
+                    "mixHash" : "0x369cb1e5ffbf059ab63d26fd0bcc3fec8150faca2009543f331a9b5ea804f48a",
+                    "nonce" : "0x502fdafe83b9e0b3",
+                    "number" : "0x01",
+                    "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
+                    "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
+                    "stateRoot" : "0xfcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xec4c6e46f2c1de8fd7e409b736987d61f3337a5df436f64328b46e963712856d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0ec4c6e46f2c1de8fd7e409b736987d61f3337a5df436f64328b46e963712856da00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0369cb1e5ffbf059ab63d26fd0bcc3fec8150faca2009543f331a9b5ea804f48a88502fdafe83b9e0b3f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a2000000000000000000000000000000000000001ca0f90a42bc2ca374b02460c8b21dad07c40c70a84732dc76c91b0bb4045f8b59f7a03c926786943ae0abf73a76ff6e17b966fe580875ea58a6f71063c88e7605ea13c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a200000000000000000000000000000000000000",
+                        "gasLimit" : "0x011170",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf90a42bc2ca374b02460c8b21dad07c40c70a84732dc76c91b0bb4045f8b59f7",
+                        "s" : "0x3c926786943ae0abf73a76ff6e17b966fe580875ea58a6f71063c88e7605ea13",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa844b7789767d9a6bca64261859f3625dbdf9e3837cdd952138ebcf5757ef39e",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4caf3",
+                "balance" : "0x4563918244f51170",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -885,7 +1081,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a4450d",
+                "balance" : "0xe8d4a3fe90",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d2g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d2g0v0.json
index 845e65c29..71ce1f834 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d2g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d2g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeReturn_d2g0v0_EIP150" : {
+    "RevertOpcodeReturn_d2g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c6ab",
-                    "hash" : "0x5567e30e2ef55180eb7678f9bb020d19baa5294d06f0b9e161af957cd4c35d1b",
-                    "mixHash" : "0x8e28ca5f86870f871c46591a909eb9c1d3b263d45e347e5cb1c70f2ada14ddcc",
-                    "nonce" : "0x82514f85d5751d4a",
+                    "hash" : "0xeb9b3d55b2dde6c4d3c6a19aa97fdfcb0cdec42636947dffbbbeebbedcf64f90",
+                    "mixHash" : "0xd1117f21d768a7269ca87d497612ea0123be112aef18cd3d022ce22b28294538",
+                    "nonce" : "0x6323c55021449e93",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0xc37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497",
-                    "stateRoot" : "0x5a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0",
+                    "receiptTrie" : "0xb96f2fe66460b02e4130a70fcad099057e419842cb2bffed1e942bc19ce872ad",
+                    "stateRoot" : "0xea4c667e3e83b18e5d91e42068308c1e460744f3bd5702a3a7e6610a92bae205",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc25d7162e6e13bf0648b3d8529d8c3b60e8cf45ae297a20e6e15107cb5f07b48",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0a0c25d7162e6e13bf0648b3d8529d8c3b60e8cf45ae297a20e6e15107cb5f07b48a0c37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a08e28ca5f86870f871c46591a909eb9c1d3b263d45e347e5cb1c70f2ada14ddcc8882514f85d5751d4af882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ca038700c9093b0249b5a13fa556ebfbc686d155e2cb6a2cf996b765e8051aff41fa00b59c5992cba530a752cf777017c2c2d95a7dc9978361d3f797ace83fe2449e8c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ea4c667e3e83b18e5d91e42068308c1e460744f3bd5702a3a7e6610a92bae205a0c25d7162e6e13bf0648b3d8529d8c3b60e8cf45ae297a20e6e15107cb5f07b48a0b96f2fe66460b02e4130a70fcad099057e419842cb2bffed1e942bc19ce872adb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a0d1117f21d768a7269ca87d497612ea0123be112aef18cd3d022ce22b28294538886323c55021449e93f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ca038700c9093b0249b5a13fa556ebfbc686d155e2cb6a2cf996b765e8051aff41fa00b59c5992cba530a752cf777017c2c2d95a7dc9978361d3f797ace83fe2449e8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5567e30e2ef55180eb7678f9bb020d19baa5294d06f0b9e161af957cd4c35d1b",
-        "network" : "EIP150",
+        "lastblockhash" : "0xeb9b3d55b2dde6c4d3c6a19aa97fdfcb0cdec42636947dffbbbeebbedcf64f90",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c6ab",
                 "code" : "",
@@ -188,10 +195,206 @@
             }
         }
     },
-    "RevertOpcodeReturn_d2g0v0_EIP158" : {
+    "RevertOpcodeReturn_d2g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d2g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x02c6ab",
+                    "hash" : "0x01cc29a8ac8b02350156eb68363e28585dc78f34457811215ab796fc224540fe",
+                    "mixHash" : "0x4c034798aaf6616d61524af1f975378fc40b9327fe92e1ec2b8436fb8550965c",
+                    "nonce" : "0xaf64513bd957a9d1",
+                    "number" : "0x01",
+                    "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
+                    "receiptTrie" : "0xb96f2fe66460b02e4130a70fcad099057e419842cb2bffed1e942bc19ce872ad",
+                    "stateRoot" : "0xea4c667e3e83b18e5d91e42068308c1e460744f3bd5702a3a7e6610a92bae205",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc25d7162e6e13bf0648b3d8529d8c3b60e8cf45ae297a20e6e15107cb5f07b48",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ea4c667e3e83b18e5d91e42068308c1e460744f3bd5702a3a7e6610a92bae205a0c25d7162e6e13bf0648b3d8529d8c3b60e8cf45ae297a20e6e15107cb5f07b48a0b96f2fe66460b02e4130a70fcad099057e419842cb2bffed1e942bc19ce872adb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a04c034798aaf6616d61524af1f975378fc40b9327fe92e1ec2b8436fb8550965c88af64513bd957a9d1f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ca038700c9093b0249b5a13fa556ebfbc686d155e2cb6a2cf996b765e8051aff41fa00b59c5992cba530a752cf777017c2c2d95a7dc9978361d3f797ace83fe2449e8c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
+                        "gasLimit" : "0x0c3500",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x38700c9093b0249b5a13fa556ebfbc686d155e2cb6a2cf996b765e8051aff41f",
+                        "s" : "0x0b59c5992cba530a752cf777017c2c2d95a7dc9978361d3f797ace83fe2449e8",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x01cc29a8ac8b02350156eb68363e28585dc78f34457811215ab796fc224540fe",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f6c6ab",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa500000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa600000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a24955",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa500000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa600000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeReturn_d2g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -203,9 +406,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c6ab",
-                    "hash" : "0xa278979ec83c506c47ef5eaf5f4b110844441b7d798ccea4b18826bbdb73c574",
-                    "mixHash" : "0x5264cea78520675190b00c9ccc5110dd7d376d239661343fd827f275e8b2edcc",
-                    "nonce" : "0x9f45c384d4e3add3",
+                    "hash" : "0x921db4a9bd70065fe561c3ac466e16f3922b644c7f6abe9eab4180e8a8f9eebb",
+                    "mixHash" : "0xf5f71d393608b77f5dcd08061218ef528a61249117a0e0824b10e96603b21aa0",
+                    "nonce" : "0xabf9c532c0e0b2c4",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
                     "receiptTrie" : "0xc37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497",
@@ -214,7 +417,7 @@
                     "transactionsTrie" : "0xc25d7162e6e13bf0648b3d8529d8c3b60e8cf45ae297a20e6e15107cb5f07b48",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0a0c25d7162e6e13bf0648b3d8529d8c3b60e8cf45ae297a20e6e15107cb5f07b48a0c37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a05264cea78520675190b00c9ccc5110dd7d376d239661343fd827f275e8b2edcc889f45c384d4e3add3f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ca038700c9093b0249b5a13fa556ebfbc686d155e2cb6a2cf996b765e8051aff41fa00b59c5992cba530a752cf777017c2c2d95a7dc9978361d3f797ace83fe2449e8c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0a0c25d7162e6e13bf0648b3d8529d8c3b60e8cf45ae297a20e6e15107cb5f07b48a0c37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a0f5f71d393608b77f5dcd08061218ef528a61249117a0e0824b10e96603b21aa088abf9c532c0e0b2c4f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ca038700c9093b0249b5a13fa556ebfbc686d155e2cb6a2cf996b765e8051aff41fa00b59c5992cba530a752cf777017c2c2d95a7dc9978361d3f797ace83fe2449e8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -251,8 +454,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa278979ec83c506c47ef5eaf5f4b110844441b7d798ccea4b18826bbdb73c574",
-        "network" : "EIP158",
+        "lastblockhash" : "0x921db4a9bd70065fe561c3ac466e16f3922b644c7f6abe9eab4180e8a8f9eebb",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c6ab",
@@ -377,10 +580,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d2g0v0_Frontier" : {
+    "RevertOpcodeReturn_d2g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -391,19 +594,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x02c417",
-                    "hash" : "0xf6c172bd9384da692c725653e69b2cb1761202f581c2efb8598f042066ab053c",
-                    "mixHash" : "0xa64668e68d87040a19dfbf10523cee5788a70f3b3447856fd399eea770627493",
-                    "nonce" : "0x81eeda34dc757871",
+                    "gasUsed" : "0x02c6ab",
+                    "hash" : "0x1d0c80946bd32c4f5c4ede52bef748a0995d30b714fb1a8c1c6746aaf86542b1",
+                    "mixHash" : "0xdbb6c8cd754c0b64122a2a9faa6c71ab7c82293cd0c2824defcbb1e1250372c2",
+                    "nonce" : "0xfe89aecb99f40dc1",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0xf0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73b",
-                    "stateRoot" : "0x341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15f",
+                    "receiptTrie" : "0xc37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497",
+                    "stateRoot" : "0x5a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc25d7162e6e13bf0648b3d8529d8c3b60e8cf45ae297a20e6e15107cb5f07b48",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15fa0c25d7162e6e13bf0648b3d8529d8c3b60e8cf45ae297a20e6e15107cb5f07b48a0f0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c4178203e880a0a64668e68d87040a19dfbf10523cee5788a70f3b3447856fd399eea7706274938881eeda34dc757871f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ca038700c9093b0249b5a13fa556ebfbc686d155e2cb6a2cf996b765e8051aff41fa00b59c5992cba530a752cf777017c2c2d95a7dc9978361d3f797ace83fe2449e8c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0a0c25d7162e6e13bf0648b3d8529d8c3b60e8cf45ae297a20e6e15107cb5f07b48a0c37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a0dbb6c8cd754c0b64122a2a9faa6c71ab7c82293cd0c2824defcbb1e1250372c288fe89aecb99f40dc1f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ca038700c9093b0249b5a13fa556ebfbc686d155e2cb6a2cf996b765e8051aff41fa00b59c5992cba530a752cf777017c2c2d95a7dc9978361d3f797ace83fe2449e8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -440,11 +643,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf6c172bd9384da692c725653e69b2cb1761202f581c2efb8598f042066ab053c",
-        "network" : "Frontier",
+        "lastblockhash" : "0x1d0c80946bd32c4f5c4ede52bef748a0995d30b714fb1a8c1c6746aaf86542b1",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f6c417",
+                "balance" : "0x4563918244f6c6ab",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -500,7 +703,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a24be9",
+                "balance" : "0xe8d4a24955",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -566,10 +769,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d2g0v0_Homestead" : {
+    "RevertOpcodeReturn_d2g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -581,9 +784,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c417",
-                    "hash" : "0x77412e446380339e0db2a2dabfa0f0eb9ce8d498031f7a60f491b02b85c74c12",
-                    "mixHash" : "0xe3d366d63286f87dae805099ec074a93270ef61fa538e013956a925dc0309721",
-                    "nonce" : "0x318779f0d9581819",
+                    "hash" : "0x9b56742f9ea09d6db066bb27a1b3e7d71a021cc05c5959ce5af7efda62a81632",
+                    "mixHash" : "0x73044ed79382f3658f410b173d6499af9fa259adcd36489964c5663935b2cae7",
+                    "nonce" : "0xa2261eb2e04fab5a",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
                     "receiptTrie" : "0xf0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73b",
@@ -592,7 +795,7 @@
                     "transactionsTrie" : "0xc25d7162e6e13bf0648b3d8529d8c3b60e8cf45ae297a20e6e15107cb5f07b48",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15fa0c25d7162e6e13bf0648b3d8529d8c3b60e8cf45ae297a20e6e15107cb5f07b48a0f0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c4178203e880a0e3d366d63286f87dae805099ec074a93270ef61fa538e013956a925dc030972188318779f0d9581819f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ca038700c9093b0249b5a13fa556ebfbc686d155e2cb6a2cf996b765e8051aff41fa00b59c5992cba530a752cf777017c2c2d95a7dc9978361d3f797ace83fe2449e8c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15fa0c25d7162e6e13bf0648b3d8529d8c3b60e8cf45ae297a20e6e15107cb5f07b48a0f0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c4178203e880a073044ed79382f3658f410b173d6499af9fa259adcd36489964c5663935b2cae788a2261eb2e04fab5af882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ca038700c9093b0249b5a13fa556ebfbc686d155e2cb6a2cf996b765e8051aff41fa00b59c5992cba530a752cf777017c2c2d95a7dc9978361d3f797ace83fe2449e8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -629,8 +832,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x77412e446380339e0db2a2dabfa0f0eb9ce8d498031f7a60f491b02b85c74c12",
-        "network" : "Homestead",
+        "lastblockhash" : "0x9b56742f9ea09d6db066bb27a1b3e7d71a021cc05c5959ce5af7efda62a81632",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c417",
@@ -755,10 +958,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d2g0v0_Metropolis" : {
+    "RevertOpcodeReturn_d2g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d2g0v0Filler.json"
         },
         "blocks" : [
@@ -769,19 +972,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x02c6ab",
-                    "hash" : "0x21f8cba1574934653d668923cce686db14ca99300643b456f2befcc0d797a677",
-                    "mixHash" : "0x619eaeceabec5b5023949dc42adc1a19a5d74d903f12987f549a6b9d01cc90f0",
-                    "nonce" : "0x191bff6e1815341a",
+                    "gasUsed" : "0x02c417",
+                    "hash" : "0xb11ce2c4316744a6a3601467013a3a43ab5c1ecd9e994208f3b69f1ccf46aa07",
+                    "mixHash" : "0x427fceb3ad7d2372b9df840347ecefa6faa562ef6c3290d56bf3241452bd0109",
+                    "nonce" : "0x0fd0d5c1c5d71243",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0xb96f2fe66460b02e4130a70fcad099057e419842cb2bffed1e942bc19ce872ad",
-                    "stateRoot" : "0xea4c667e3e83b18e5d91e42068308c1e460744f3bd5702a3a7e6610a92bae205",
+                    "receiptTrie" : "0xf0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73b",
+                    "stateRoot" : "0x341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc25d7162e6e13bf0648b3d8529d8c3b60e8cf45ae297a20e6e15107cb5f07b48",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ea4c667e3e83b18e5d91e42068308c1e460744f3bd5702a3a7e6610a92bae205a0c25d7162e6e13bf0648b3d8529d8c3b60e8cf45ae297a20e6e15107cb5f07b48a0b96f2fe66460b02e4130a70fcad099057e419842cb2bffed1e942bc19ce872adb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a0619eaeceabec5b5023949dc42adc1a19a5d74d903f12987f549a6b9d01cc90f088191bff6e1815341af882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ca038700c9093b0249b5a13fa556ebfbc686d155e2cb6a2cf996b765e8051aff41fa00b59c5992cba530a752cf777017c2c2d95a7dc9978361d3f797ace83fe2449e8c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15fa0c25d7162e6e13bf0648b3d8529d8c3b60e8cf45ae297a20e6e15107cb5f07b48a0f0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c4178203e880a0427fceb3ad7d2372b9df840347ecefa6faa562ef6c3290d56bf3241452bd0109880fd0d5c1c5d71243f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ca038700c9093b0249b5a13fa556ebfbc686d155e2cb6a2cf996b765e8051aff41fa00b59c5992cba530a752cf777017c2c2d95a7dc9978361d3f797ace83fe2449e8c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -818,18 +1021,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x21f8cba1574934653d668923cce686db14ca99300643b456f2befcc0d797a677",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb11ce2c4316744a6a3601467013a3a43ab5c1ecd9e994208f3b69f1ccf46aa07",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f6c6ab",
+                "balance" : "0x4563918244f6c417",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -885,7 +1081,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a24955",
+                "balance" : "0xe8d4a24be9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d2g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d2g1v0.json
index a65289494..ca2934bf1 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d2g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d2g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeReturn_d2g1v0_EIP150" : {
+    "RevertOpcodeReturn_d2g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d2g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0x93d72dc59f2371935eb29e436c70dd96132ce94c3e92320b16f7fe536e8b6853",
-                    "mixHash" : "0xc545079615384e2b017056387f695ac7901aed2ddb9737bca048f563ed4b5a2f",
-                    "nonce" : "0x7b72bd319ec912de",
+                    "hash" : "0x42eb292d65e74c9cc9aa8ef502c3a74f9babf034a2113688ad7e57072c2aed08",
+                    "mixHash" : "0xd40ff210f717d2d22fafdf60ac0a4a2058806a334c330174beccd5619b2b09ce",
+                    "nonce" : "0x4c8dcc9f07f4d8bb",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
-                    "stateRoot" : "0xfcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660f",
+                    "receiptTrie" : "0x33206fdb0b04af73aed5fcc49c377894a2ad7acc74a06782884999e9c75de4ba",
+                    "stateRoot" : "0x0bb265ff27c5004648d06d3899c153e978d79cfdb4a54980e1f47ca0320b1d57",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1d56f8e2f0e8c15b590861d2f97a04685a31d8446df82dca71e87b3aa4b74325",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa01d56f8e2f0e8c15b590861d2f97a04685a31d8446df82dca71e87b3aa4b74325a00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0c545079615384e2b017056387f695ac7901aed2ddb9737bca048f563ed4b5a2f887b72bd319ec912def882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba0860cb83599312cf4ed9ee4f7ff70a1eeb3e07dd7962821c628991098164b7b42a003820be101f55e7d6c6c0fd82a03b2c070548ea3ed4d7e616143bc85ee947732c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00bb265ff27c5004648d06d3899c153e978d79cfdb4a54980e1f47ca0320b1d57a01d56f8e2f0e8c15b590861d2f97a04685a31d8446df82dca71e87b3aa4b74325a033206fdb0b04af73aed5fcc49c377894a2ad7acc74a06782884999e9c75de4bab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0d40ff210f717d2d22fafdf60ac0a4a2058806a334c330174beccd5619b2b09ce884c8dcc9f07f4d8bbf882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba0860cb83599312cf4ed9ee4f7ff70a1eeb3e07dd7962821c628991098164b7b42a003820be101f55e7d6c6c0fd82a03b2c070548ea3ed4d7e616143bc85ee947732c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x93d72dc59f2371935eb29e436c70dd96132ce94c3e92320b16f7fe536e8b6853",
-        "network" : "EIP150",
+        "lastblockhash" : "0x42eb292d65e74c9cc9aa8ef502c3a74f9babf034a2113688ad7e57072c2aed08",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51170",
                 "code" : "",
@@ -188,10 +195,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d2g1v0_EIP158" : {
+    "RevertOpcodeReturn_d2g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d2g1v0Filler.json"
         },
         "blocks" : [
@@ -203,18 +210,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0x6f1587e0f13e2e811a35ac1ea6b53862c25e872056f97f342a6dbe964860079b",
-                    "mixHash" : "0xa02f916f46818fda1b4465ef2e081dbf1cffc244ae87453e0103772b3a9d9c84",
-                    "nonce" : "0xbe13e75a27338df0",
+                    "hash" : "0x647427a65fac993670a921228494ed89fa653ba50904c8016fd7313322362f28",
+                    "mixHash" : "0xe2b82c72b9f426423d174ad326ed22245506aa0aabb07e196cfac801b96e6c9d",
+                    "nonce" : "0x255be9acd8d195be",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
-                    "stateRoot" : "0xfcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660f",
+                    "receiptTrie" : "0x33206fdb0b04af73aed5fcc49c377894a2ad7acc74a06782884999e9c75de4ba",
+                    "stateRoot" : "0x0bb265ff27c5004648d06d3899c153e978d79cfdb4a54980e1f47ca0320b1d57",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1d56f8e2f0e8c15b590861d2f97a04685a31d8446df82dca71e87b3aa4b74325",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa01d56f8e2f0e8c15b590861d2f97a04685a31d8446df82dca71e87b3aa4b74325a00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0a02f916f46818fda1b4465ef2e081dbf1cffc244ae87453e0103772b3a9d9c8488be13e75a27338df0f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba0860cb83599312cf4ed9ee4f7ff70a1eeb3e07dd7962821c628991098164b7b42a003820be101f55e7d6c6c0fd82a03b2c070548ea3ed4d7e616143bc85ee947732c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00bb265ff27c5004648d06d3899c153e978d79cfdb4a54980e1f47ca0320b1d57a01d56f8e2f0e8c15b590861d2f97a04685a31d8446df82dca71e87b3aa4b74325a033206fdb0b04af73aed5fcc49c377894a2ad7acc74a06782884999e9c75de4bab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0e2b82c72b9f426423d174ad326ed22245506aa0aabb07e196cfac801b96e6c9d88255be9acd8d195bef882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba0860cb83599312cf4ed9ee4f7ff70a1eeb3e07dd7962821c628991098164b7b42a003820be101f55e7d6c6c0fd82a03b2c070548ea3ed4d7e616143bc85ee947732c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -251,9 +258,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6f1587e0f13e2e811a35ac1ea6b53862c25e872056f97f342a6dbe964860079b",
-        "network" : "EIP158",
+        "lastblockhash" : "0x647427a65fac993670a921228494ed89fa653ba50904c8016fd7313322362f28",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51170",
                 "code" : "",
@@ -377,10 +391,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d2g1v0_Frontier" : {
+    "RevertOpcodeReturn_d2g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d2g1v0Filler.json"
         },
         "blocks" : [
@@ -392,9 +406,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0xd43fb23f1fc15117801658692f44440a4c60216b6eec278891c30e67eec8ea2f",
-                    "mixHash" : "0xc9a8c69062add33365135dbf5d1c22f7887d42d47adff7d906d2d277ff3ef336",
-                    "nonce" : "0x050a1505191f1804",
+                    "hash" : "0x56b8bef7cf4605f5ef3643dc8b8f071b682dced7f9c376bd38fd6517d276f0db",
+                    "mixHash" : "0xd8d4f6729a5477277d2f6ca537a2a30f059c767fc5583452f9672aa69b6e6b5f",
+                    "nonce" : "0xb27ede25f15ebc8e",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
                     "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
@@ -403,7 +417,7 @@
                     "transactionsTrie" : "0x1d56f8e2f0e8c15b590861d2f97a04685a31d8446df82dca71e87b3aa4b74325",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa01d56f8e2f0e8c15b590861d2f97a04685a31d8446df82dca71e87b3aa4b74325a00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0c9a8c69062add33365135dbf5d1c22f7887d42d47adff7d906d2d277ff3ef33688050a1505191f1804f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba0860cb83599312cf4ed9ee4f7ff70a1eeb3e07dd7962821c628991098164b7b42a003820be101f55e7d6c6c0fd82a03b2c070548ea3ed4d7e616143bc85ee947732c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa01d56f8e2f0e8c15b590861d2f97a04685a31d8446df82dca71e87b3aa4b74325a00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0d8d4f6729a5477277d2f6ca537a2a30f059c767fc5583452f9672aa69b6e6b5f88b27ede25f15ebc8ef882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba0860cb83599312cf4ed9ee4f7ff70a1eeb3e07dd7962821c628991098164b7b42a003820be101f55e7d6c6c0fd82a03b2c070548ea3ed4d7e616143bc85ee947732c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -440,8 +454,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd43fb23f1fc15117801658692f44440a4c60216b6eec278891c30e67eec8ea2f",
-        "network" : "Frontier",
+        "lastblockhash" : "0x56b8bef7cf4605f5ef3643dc8b8f071b682dced7f9c376bd38fd6517d276f0db",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51170",
@@ -566,10 +580,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d2g1v0_Homestead" : {
+    "RevertOpcodeReturn_d2g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d2g1v0Filler.json"
         },
         "blocks" : [
@@ -581,9 +595,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0x40c894ce5aba10193bb7de0cebf710d8071bcbda4463e0e1980b74e9b2bcb0bb",
-                    "mixHash" : "0x0d95502f27d5da072ee1bc2621cbd12c0ccd9a566d30778109b2ab2a300830e1",
-                    "nonce" : "0xcab5ddd7ec17ab37",
+                    "hash" : "0xa1f6c16453e5d0882ad13d869453b184c11ad1ab3faa2e6f10418f652a2feaba",
+                    "mixHash" : "0x33ca26f7aef2c242c412b0e54739795d7cb4b9aa3167785f938112203a2aa15a",
+                    "nonce" : "0x780829c78b4cf7d0",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
                     "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
@@ -592,7 +606,7 @@
                     "transactionsTrie" : "0x1d56f8e2f0e8c15b590861d2f97a04685a31d8446df82dca71e87b3aa4b74325",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa01d56f8e2f0e8c15b590861d2f97a04685a31d8446df82dca71e87b3aa4b74325a00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a00d95502f27d5da072ee1bc2621cbd12c0ccd9a566d30778109b2ab2a300830e188cab5ddd7ec17ab37f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba0860cb83599312cf4ed9ee4f7ff70a1eeb3e07dd7962821c628991098164b7b42a003820be101f55e7d6c6c0fd82a03b2c070548ea3ed4d7e616143bc85ee947732c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa01d56f8e2f0e8c15b590861d2f97a04685a31d8446df82dca71e87b3aa4b74325a00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a033ca26f7aef2c242c412b0e54739795d7cb4b9aa3167785f938112203a2aa15a88780829c78b4cf7d0f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba0860cb83599312cf4ed9ee4f7ff70a1eeb3e07dd7962821c628991098164b7b42a003820be101f55e7d6c6c0fd82a03b2c070548ea3ed4d7e616143bc85ee947732c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -629,8 +643,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x40c894ce5aba10193bb7de0cebf710d8071bcbda4463e0e1980b74e9b2bcb0bb",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa1f6c16453e5d0882ad13d869453b184c11ad1ab3faa2e6f10418f652a2feaba",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51170",
@@ -755,10 +769,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d2g1v0_Metropolis" : {
+    "RevertOpcodeReturn_d2g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d2g1v0Filler.json"
         },
         "blocks" : [
@@ -770,18 +784,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0x63029ffe31a6411fce84553e293e921625b54b51a301fedc971b91a882d0952c",
-                    "mixHash" : "0xdc34f1fb21df3b4466e4f6d6c48dad7fad91882237734cc23521c30a48af683d",
-                    "nonce" : "0x36ef04ec8e4045a8",
+                    "hash" : "0x374660908b87aa3468bfc3e01d80a13924f1c82d8f5d87a2d4a77af6f11846a1",
+                    "mixHash" : "0x6569e7bb8f753292c7852cfa4365584a32cd9a35aae973907509cfa39933fa6d",
+                    "nonce" : "0x9ef265b103f00455",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0x33206fdb0b04af73aed5fcc49c377894a2ad7acc74a06782884999e9c75de4ba",
-                    "stateRoot" : "0x0bb265ff27c5004648d06d3899c153e978d79cfdb4a54980e1f47ca0320b1d57",
+                    "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
+                    "stateRoot" : "0xfcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1d56f8e2f0e8c15b590861d2f97a04685a31d8446df82dca71e87b3aa4b74325",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00bb265ff27c5004648d06d3899c153e978d79cfdb4a54980e1f47ca0320b1d57a01d56f8e2f0e8c15b590861d2f97a04685a31d8446df82dca71e87b3aa4b74325a033206fdb0b04af73aed5fcc49c377894a2ad7acc74a06782884999e9c75de4bab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0dc34f1fb21df3b4466e4f6d6c48dad7fad91882237734cc23521c30a48af683d8836ef04ec8e4045a8f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba0860cb83599312cf4ed9ee4f7ff70a1eeb3e07dd7962821c628991098164b7b42a003820be101f55e7d6c6c0fd82a03b2c070548ea3ed4d7e616143bc85ee947732c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa01d56f8e2f0e8c15b590861d2f97a04685a31d8446df82dca71e87b3aa4b74325a00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a06569e7bb8f753292c7852cfa4365584a32cd9a35aae973907509cfa39933fa6d889ef265b103f00455f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba0860cb83599312cf4ed9ee4f7ff70a1eeb3e07dd7962821c628991098164b7b42a003820be101f55e7d6c6c0fd82a03b2c070548ea3ed4d7e616143bc85ee947732c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
@@ -818,16 +832,198 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x63029ffe31a6411fce84553e293e921625b54b51a301fedc971b91a882d0952c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x374660908b87aa3468bfc3e01d80a13924f1c82d8f5d87a2d4a77af6f11846a1",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f51170",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa500000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa600000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3fe90",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa500000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa600000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeReturn_d2g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d2g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x011170",
+                    "hash" : "0x45d51a0a33b935247321de22799363eb79116d3a271a25b1d9b2655ebf0e91df",
+                    "mixHash" : "0xba7a26741714b538ac24486fa28f7674efa1a4634a428685f302fc4346895a71",
+                    "nonce" : "0xb92dec1e7ad18b27",
+                    "number" : "0x01",
+                    "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
+                    "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
+                    "stateRoot" : "0xfcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1d56f8e2f0e8c15b590861d2f97a04685a31d8446df82dca71e87b3aa4b74325",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa01d56f8e2f0e8c15b590861d2f97a04685a31d8446df82dca71e87b3aa4b74325a00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0ba7a26741714b538ac24486fa28f7674efa1a4634a428685f302fc4346895a7188b92dec1e7ad18b27f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a3000000000000000000000000000000000000001ba0860cb83599312cf4ed9ee4f7ff70a1eeb3e07dd7962821c628991098164b7b42a003820be101f55e7d6c6c0fd82a03b2c070548ea3ed4d7e616143bc85ee947732c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a300000000000000000000000000000000000000",
+                        "gasLimit" : "0x011170",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x860cb83599312cf4ed9ee4f7ff70a1eeb3e07dd7962821c628991098164b7b42",
+                        "s" : "0x03820be101f55e7d6c6c0fd82a03b2c070548ea3ed4d7e616143bc85ee947732",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x45d51a0a33b935247321de22799363eb79116d3a271a25b1d9b2655ebf0e91df",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51170",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d3g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d3g0v0.json
index 2a24857cc..fa083896b 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d3g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d3g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeReturn_d3g0v0_EIP150" : {
+    "RevertOpcodeReturn_d3g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d3g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x02c6ab",
-                    "hash" : "0x6824dca9c92be2a324048cc5d70227476efb533303bcba9efab505df18198467",
-                    "mixHash" : "0x74f8ea702e3963096ca95c16492ef4b58c5f379f5b379c48ef0384fe61e8819a",
-                    "nonce" : "0x7a4dc22578683cba",
+                    "gasUsed" : "0xcaf3",
+                    "hash" : "0x5656e93b43b99e431fd81b276710de58ec793911cf3d9291709d325b20011d83",
+                    "mixHash" : "0x524c2144b06af33ee51cb2f308c15b7dec76ac987fbaf42408a00a11d4650423",
+                    "nonce" : "0xf2ed2de2f753434a",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0xc37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497",
-                    "stateRoot" : "0x5a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0",
+                    "receiptTrie" : "0x018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7",
+                    "stateRoot" : "0x3ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x73461a8d44bf13fecfd069b7102513868b6a080ee30fcd67142b246ab61ed80a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0a073461a8d44bf13fecfd069b7102513868b6a080ee30fcd67142b246ab61ed80aa0c37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a074f8ea702e3963096ca95c16492ef4b58c5f379f5b379c48ef0384fe61e8819a887a4dc22578683cbaf882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a4000000000000000000000000000000000000001ca06d0541a046bd28f7cdb14d357020e304317b585f8ffe3583b9d38d5e7a0bd598a00cca3c0e32990cd0938f71534098aa025ebbc45778363a7080a213a7095dc11ac0",
+                "rlp" : "0xf9027ff901f7a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8a073461a8d44bf13fecfd069b7102513868b6a080ee30fcd67142b246ab61ed80aa0018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082caf38203e880a0524c2144b06af33ee51cb2f308c15b7dec76ac987fbaf42408a00a11d465042388f2ed2de2f753434af882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a4000000000000000000000000000000000000001ca06d0541a046bd28f7cdb14d357020e304317b585f8ffe3583b9d38d5e7a0bd598a00cca3c0e32990cd0938f71534098aa025ebbc45778363a7080a213a7095dc11ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a400000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6824dca9c92be2a324048cc5d70227476efb533303bcba9efab505df18198467",
-        "network" : "EIP150",
+        "lastblockhash" : "0x5656e93b43b99e431fd81b276710de58ec793911cf3d9291709d325b20011d83",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f6c6ab",
+                "balance" : "0x4563918244f4caf3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -122,7 +129,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a24955",
+                "balance" : "0xe8d4a4450d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -188,10 +195,206 @@
             }
         }
     },
-    "RevertOpcodeReturn_d3g0v0_EIP158" : {
+    "RevertOpcodeReturn_d3g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d3g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xcaf3",
+                    "hash" : "0xe19f6290f6d52f2d682c140a2c7397f9e9ff25c24e88bd7cfff378994b4be1e7",
+                    "mixHash" : "0x515ec294cb95fc11e67709be88ea5cdb289ef17cbf11230f46923fdf83f89695",
+                    "nonce" : "0x0b7c246c71adb9a4",
+                    "number" : "0x01",
+                    "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
+                    "receiptTrie" : "0x018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7",
+                    "stateRoot" : "0x3ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x73461a8d44bf13fecfd069b7102513868b6a080ee30fcd67142b246ab61ed80a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9027ff901f7a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8a073461a8d44bf13fecfd069b7102513868b6a080ee30fcd67142b246ab61ed80aa0018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082caf38203e880a0515ec294cb95fc11e67709be88ea5cdb289ef17cbf11230f46923fdf83f89695880b7c246c71adb9a4f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a4000000000000000000000000000000000000001ca06d0541a046bd28f7cdb14d357020e304317b585f8ffe3583b9d38d5e7a0bd598a00cca3c0e32990cd0938f71534098aa025ebbc45778363a7080a213a7095dc11ac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a400000000000000000000000000000000000000",
+                        "gasLimit" : "0x0c3500",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6d0541a046bd28f7cdb14d357020e304317b585f8ffe3583b9d38d5e7a0bd598",
+                        "s" : "0x0cca3c0e32990cd0938f71534098aa025ebbc45778363a7080a213a7095dc11a",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe19f6290f6d52f2d682c140a2c7397f9e9ff25c24e88bd7cfff378994b4be1e7",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4caf3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa500000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa600000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a4450d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa500000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa600000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeReturn_d3g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d3g0v0Filler.json"
         },
         "blocks" : [
@@ -203,9 +406,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c6ab",
-                    "hash" : "0x68391e15eb52b9d37fb6edd2cba881576a042b537b248369130cbfcc92e8ae49",
-                    "mixHash" : "0x52da7ea233c6679da75c66f08a4fb2ccf363bf05b9db6e7db48523162189b92d",
-                    "nonce" : "0x674933f3f94c9c69",
+                    "hash" : "0x835639f20cb10ebf1c330ab46127015fb01113ffb03c64da7ca6f8e154b1ce7c",
+                    "mixHash" : "0x4a93749e8812c359e3e2863775b27a2c353ee2b5a5c5e42eda0e3ec1d2b8dec8",
+                    "nonce" : "0x17bf74874d4a5f20",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
                     "receiptTrie" : "0xc37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497",
@@ -214,7 +417,7 @@
                     "transactionsTrie" : "0x73461a8d44bf13fecfd069b7102513868b6a080ee30fcd67142b246ab61ed80a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0a073461a8d44bf13fecfd069b7102513868b6a080ee30fcd67142b246ab61ed80aa0c37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a052da7ea233c6679da75c66f08a4fb2ccf363bf05b9db6e7db48523162189b92d88674933f3f94c9c69f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a4000000000000000000000000000000000000001ca06d0541a046bd28f7cdb14d357020e304317b585f8ffe3583b9d38d5e7a0bd598a00cca3c0e32990cd0938f71534098aa025ebbc45778363a7080a213a7095dc11ac0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0a073461a8d44bf13fecfd069b7102513868b6a080ee30fcd67142b246ab61ed80aa0c37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a04a93749e8812c359e3e2863775b27a2c353ee2b5a5c5e42eda0e3ec1d2b8dec88817bf74874d4a5f20f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a4000000000000000000000000000000000000001ca06d0541a046bd28f7cdb14d357020e304317b585f8ffe3583b9d38d5e7a0bd598a00cca3c0e32990cd0938f71534098aa025ebbc45778363a7080a213a7095dc11ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a400000000000000000000000000000000000000",
@@ -251,8 +454,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x68391e15eb52b9d37fb6edd2cba881576a042b537b248369130cbfcc92e8ae49",
-        "network" : "EIP158",
+        "lastblockhash" : "0x835639f20cb10ebf1c330ab46127015fb01113ffb03c64da7ca6f8e154b1ce7c",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c6ab",
@@ -377,10 +580,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d3g0v0_Frontier" : {
+    "RevertOpcodeReturn_d3g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d3g0v0Filler.json"
         },
         "blocks" : [
@@ -391,19 +594,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x02c417",
-                    "hash" : "0x1a9bbae4d22359be8a0352cdd64f261060240b03a3f80aaac2f01d0dca3df789",
-                    "mixHash" : "0xf258bd433acc9bd9293814f452ba21a054f7d040e2b2927566a5c54a052ad01d",
-                    "nonce" : "0x3365c0295da8fe2d",
+                    "gasUsed" : "0x02c6ab",
+                    "hash" : "0x39eb77f41e0ccc65e6b70309282be261fa612e6301a0e620b059b2a5ffb0e26e",
+                    "mixHash" : "0xe92e25b22e2af5e705c8cd6b3212bb1b11f17a51fe23252dccaff73b4ef43fad",
+                    "nonce" : "0xebaf2e1e563725dc",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0xf0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73b",
-                    "stateRoot" : "0x341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15f",
+                    "receiptTrie" : "0xc37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497",
+                    "stateRoot" : "0x5a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x73461a8d44bf13fecfd069b7102513868b6a080ee30fcd67142b246ab61ed80a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15fa073461a8d44bf13fecfd069b7102513868b6a080ee30fcd67142b246ab61ed80aa0f0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c4178203e880a0f258bd433acc9bd9293814f452ba21a054f7d040e2b2927566a5c54a052ad01d883365c0295da8fe2df882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a4000000000000000000000000000000000000001ca06d0541a046bd28f7cdb14d357020e304317b585f8ffe3583b9d38d5e7a0bd598a00cca3c0e32990cd0938f71534098aa025ebbc45778363a7080a213a7095dc11ac0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0a073461a8d44bf13fecfd069b7102513868b6a080ee30fcd67142b246ab61ed80aa0c37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a0e92e25b22e2af5e705c8cd6b3212bb1b11f17a51fe23252dccaff73b4ef43fad88ebaf2e1e563725dcf882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a4000000000000000000000000000000000000001ca06d0541a046bd28f7cdb14d357020e304317b585f8ffe3583b9d38d5e7a0bd598a00cca3c0e32990cd0938f71534098aa025ebbc45778363a7080a213a7095dc11ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a400000000000000000000000000000000000000",
@@ -440,11 +643,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1a9bbae4d22359be8a0352cdd64f261060240b03a3f80aaac2f01d0dca3df789",
-        "network" : "Frontier",
+        "lastblockhash" : "0x39eb77f41e0ccc65e6b70309282be261fa612e6301a0e620b059b2a5ffb0e26e",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f6c417",
+                "balance" : "0x4563918244f6c6ab",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -500,7 +703,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a24be9",
+                "balance" : "0xe8d4a24955",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -566,10 +769,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d3g0v0_Homestead" : {
+    "RevertOpcodeReturn_d3g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d3g0v0Filler.json"
         },
         "blocks" : [
@@ -581,9 +784,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c417",
-                    "hash" : "0x2d11b097f78a0be9cefb5d21e89d7732c42d81081684031b9d70a7937ade733d",
-                    "mixHash" : "0x1036f92b3aab8cde3e9a38d5cb89b9d3a06c4a5e6f3c955b61804a13d11303a0",
-                    "nonce" : "0x2914559e6f677e15",
+                    "hash" : "0x67092b5302c1ffcd94163ca50a31393f23be46b94bb10e717ec3bba72113a226",
+                    "mixHash" : "0x876f04d5ac850365df252ef9da3ea7788ed2d8744f513dd06bea5e1f1bce5033",
+                    "nonce" : "0x28fa8fdd63e44c3a",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
                     "receiptTrie" : "0xf0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73b",
@@ -592,7 +795,7 @@
                     "transactionsTrie" : "0x73461a8d44bf13fecfd069b7102513868b6a080ee30fcd67142b246ab61ed80a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15fa073461a8d44bf13fecfd069b7102513868b6a080ee30fcd67142b246ab61ed80aa0f0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c4178203e880a01036f92b3aab8cde3e9a38d5cb89b9d3a06c4a5e6f3c955b61804a13d11303a0882914559e6f677e15f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a4000000000000000000000000000000000000001ca06d0541a046bd28f7cdb14d357020e304317b585f8ffe3583b9d38d5e7a0bd598a00cca3c0e32990cd0938f71534098aa025ebbc45778363a7080a213a7095dc11ac0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15fa073461a8d44bf13fecfd069b7102513868b6a080ee30fcd67142b246ab61ed80aa0f0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c4178203e880a0876f04d5ac850365df252ef9da3ea7788ed2d8744f513dd06bea5e1f1bce50338828fa8fdd63e44c3af882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a4000000000000000000000000000000000000001ca06d0541a046bd28f7cdb14d357020e304317b585f8ffe3583b9d38d5e7a0bd598a00cca3c0e32990cd0938f71534098aa025ebbc45778363a7080a213a7095dc11ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a400000000000000000000000000000000000000",
@@ -629,8 +832,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2d11b097f78a0be9cefb5d21e89d7732c42d81081684031b9d70a7937ade733d",
-        "network" : "Homestead",
+        "lastblockhash" : "0x67092b5302c1ffcd94163ca50a31393f23be46b94bb10e717ec3bba72113a226",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c417",
@@ -755,10 +958,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d3g0v0_Metropolis" : {
+    "RevertOpcodeReturn_d3g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d3g0v0Filler.json"
         },
         "blocks" : [
@@ -769,19 +972,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xcaf3",
-                    "hash" : "0xfad8ad52d2c3f4345cb396e4cbbf9b454dabd1b7de52cbc395943806f1206984",
-                    "mixHash" : "0xced84fb5e456607cc1f31189ab0acd40177e72a5a00ce001ed8c6ff8548a8be7",
-                    "nonce" : "0xd2b7b777cf8f69f0",
+                    "gasUsed" : "0x02c417",
+                    "hash" : "0x5e81bda01e6733580707607ca9b7f91091998038b9bd68116bc1e4b39154a26f",
+                    "mixHash" : "0x30e5cfb7b3aa5fa4fa4a92cbaa566a8848277f34822a9283d725a87e4385a7be",
+                    "nonce" : "0x341368b245c5e505",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0x018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7",
-                    "stateRoot" : "0x3ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8",
+                    "receiptTrie" : "0xf0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73b",
+                    "stateRoot" : "0x341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x73461a8d44bf13fecfd069b7102513868b6a080ee30fcd67142b246ab61ed80a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8a073461a8d44bf13fecfd069b7102513868b6a080ee30fcd67142b246ab61ed80aa0018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082caf38203e880a0ced84fb5e456607cc1f31189ab0acd40177e72a5a00ce001ed8c6ff8548a8be788d2b7b777cf8f69f0f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a4000000000000000000000000000000000000001ca06d0541a046bd28f7cdb14d357020e304317b585f8ffe3583b9d38d5e7a0bd598a00cca3c0e32990cd0938f71534098aa025ebbc45778363a7080a213a7095dc11ac0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15fa073461a8d44bf13fecfd069b7102513868b6a080ee30fcd67142b246ab61ed80aa0f0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c4178203e880a030e5cfb7b3aa5fa4fa4a92cbaa566a8848277f34822a9283d725a87e4385a7be88341368b245c5e505f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a4000000000000000000000000000000000000001ca06d0541a046bd28f7cdb14d357020e304317b585f8ffe3583b9d38d5e7a0bd598a00cca3c0e32990cd0938f71534098aa025ebbc45778363a7080a213a7095dc11ac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a400000000000000000000000000000000000000",
@@ -818,18 +1021,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfad8ad52d2c3f4345cb396e4cbbf9b454dabd1b7de52cbc395943806f1206984",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x5e81bda01e6733580707607ca9b7f91091998038b9bd68116bc1e4b39154a26f",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4caf3",
+                "balance" : "0x4563918244f6c417",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -885,7 +1081,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a4450d",
+                "balance" : "0xe8d4a24be9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d3g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d3g1v0.json
index 6a52c83bf..77f3d93f5 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d3g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d3g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeReturn_d3g1v0_EIP150" : {
+    "RevertOpcodeReturn_d3g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d3g1v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x011170",
-                    "hash" : "0x850b4938bab63b0a03664be82684ae2f1792064a68d211942d18f4895f26fb85",
-                    "mixHash" : "0x46b9f10c217331a88954fa984ab54bf2c1156990dc811837e479b6a752b238ac",
-                    "nonce" : "0x3aecd0e9212c6f31",
+                    "gasUsed" : "0xcaf3",
+                    "hash" : "0xe147afc6fc8c74b82100bea5ccc69d7ed2f2968e4aea3d48abba17d47022d1c8",
+                    "mixHash" : "0x111c6db5cb9ab66adaa1d0a0591b92525bdad49b3465d94645d24ebeed6676ea",
+                    "nonce" : "0x022b8a92a41632dc",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
-                    "stateRoot" : "0xfcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660f",
+                    "receiptTrie" : "0x018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7",
+                    "stateRoot" : "0x3ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb5230ffcf0ae2f6e3635764a3c2aa3869a6d9257d55acd68eeb7c9bb6bd47c20",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0b5230ffcf0ae2f6e3635764a3c2aa3869a6d9257d55acd68eeb7c9bb6bd47c20a00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a046b9f10c217331a88954fa984ab54bf2c1156990dc811837e479b6a752b238ac883aecd0e9212c6f31f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a4000000000000000000000000000000000000001ba0922e4414482634001824b186cfd0c50e30540d6e3c7cd59844d7e14ae5705161a03613720d6d19cac323731ca8100bdb235619983fc678ca720f3cbbd9370815aac0",
+                "rlp" : "0xf9027ff901f7a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8a0b5230ffcf0ae2f6e3635764a3c2aa3869a6d9257d55acd68eeb7c9bb6bd47c20a0018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082caf38203e880a0111c6db5cb9ab66adaa1d0a0591b92525bdad49b3465d94645d24ebeed6676ea88022b8a92a41632dcf882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a4000000000000000000000000000000000000001ba0922e4414482634001824b186cfd0c50e30540d6e3c7cd59844d7e14ae5705161a03613720d6d19cac323731ca8100bdb235619983fc678ca720f3cbbd9370815aac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a400000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x850b4938bab63b0a03664be82684ae2f1792064a68d211942d18f4895f26fb85",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe147afc6fc8c74b82100bea5ccc69d7ed2f2968e4aea3d48abba17d47022d1c8",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51170",
+                "balance" : "0x4563918244f4caf3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -122,7 +129,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3fe90",
+                "balance" : "0xe8d4a4450d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -188,10 +195,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d3g1v0_EIP158" : {
+    "RevertOpcodeReturn_d3g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d3g1v0Filler.json"
         },
         "blocks" : [
@@ -202,19 +209,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x011170",
-                    "hash" : "0x4a8badeb615ac564f392b8dc5e4677c05ce725df935b79b6fc76182702dcfdb4",
-                    "mixHash" : "0x9d79a79b392ca31acad3efbfd41b5f04ae2828eee166efd7d2c62366300bf03b",
-                    "nonce" : "0xaae6eb6711d98ff5",
+                    "gasUsed" : "0xcaf3",
+                    "hash" : "0x8479b85367c4855ab9fd23ab4a89ce547e3121cae4f89046417b7d2fcdc45017",
+                    "mixHash" : "0x4b8daf7d5271d4b03a4eb8de3e32ebb67f8c27bf0274b010480bb45eb9189177",
+                    "nonce" : "0x33d69fc08d2b1d09",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
-                    "stateRoot" : "0xfcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660f",
+                    "receiptTrie" : "0x018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7",
+                    "stateRoot" : "0x3ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb5230ffcf0ae2f6e3635764a3c2aa3869a6d9257d55acd68eeb7c9bb6bd47c20",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0b5230ffcf0ae2f6e3635764a3c2aa3869a6d9257d55acd68eeb7c9bb6bd47c20a00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a09d79a79b392ca31acad3efbfd41b5f04ae2828eee166efd7d2c62366300bf03b88aae6eb6711d98ff5f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a4000000000000000000000000000000000000001ba0922e4414482634001824b186cfd0c50e30540d6e3c7cd59844d7e14ae5705161a03613720d6d19cac323731ca8100bdb235619983fc678ca720f3cbbd9370815aac0",
+                "rlp" : "0xf9027ff901f7a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8a0b5230ffcf0ae2f6e3635764a3c2aa3869a6d9257d55acd68eeb7c9bb6bd47c20a0018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082caf38203e880a04b8daf7d5271d4b03a4eb8de3e32ebb67f8c27bf0274b010480bb45eb91891778833d69fc08d2b1d09f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a4000000000000000000000000000000000000001ba0922e4414482634001824b186cfd0c50e30540d6e3c7cd59844d7e14ae5705161a03613720d6d19cac323731ca8100bdb235619983fc678ca720f3cbbd9370815aac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a400000000000000000000000000000000000000",
@@ -251,11 +258,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4a8badeb615ac564f392b8dc5e4677c05ce725df935b79b6fc76182702dcfdb4",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8479b85367c4855ab9fd23ab4a89ce547e3121cae4f89046417b7d2fcdc45017",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51170",
+                "balance" : "0x4563918244f4caf3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -311,7 +325,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3fe90",
+                "balance" : "0xe8d4a4450d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -377,10 +391,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d3g1v0_Frontier" : {
+    "RevertOpcodeReturn_d3g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d3g1v0Filler.json"
         },
         "blocks" : [
@@ -392,9 +406,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0x0994514ec607a85f3c2f05acdc24e0e319a789bb0df39c65cf41e89485c20d79",
-                    "mixHash" : "0x2b906f8b3567ad5445dcea3fd0c9a37728bbf9c5cacc5c2cc87dd00a81ad1a96",
-                    "nonce" : "0x60af927d134f1b93",
+                    "hash" : "0x03b8b1171560cf066164bcedf38f43f6b4c8563b933751639fa8d8b1681f708f",
+                    "mixHash" : "0x313682b94f8d4a36aa2a2535d74b7d6bf02443f68aa91e7676bcc3f9fccbb8be",
+                    "nonce" : "0xbed9558f657ed6da",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
                     "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
@@ -403,7 +417,7 @@
                     "transactionsTrie" : "0xb5230ffcf0ae2f6e3635764a3c2aa3869a6d9257d55acd68eeb7c9bb6bd47c20",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0b5230ffcf0ae2f6e3635764a3c2aa3869a6d9257d55acd68eeb7c9bb6bd47c20a00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a02b906f8b3567ad5445dcea3fd0c9a37728bbf9c5cacc5c2cc87dd00a81ad1a968860af927d134f1b93f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a4000000000000000000000000000000000000001ba0922e4414482634001824b186cfd0c50e30540d6e3c7cd59844d7e14ae5705161a03613720d6d19cac323731ca8100bdb235619983fc678ca720f3cbbd9370815aac0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0b5230ffcf0ae2f6e3635764a3c2aa3869a6d9257d55acd68eeb7c9bb6bd47c20a00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0313682b94f8d4a36aa2a2535d74b7d6bf02443f68aa91e7676bcc3f9fccbb8be88bed9558f657ed6daf882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a4000000000000000000000000000000000000001ba0922e4414482634001824b186cfd0c50e30540d6e3c7cd59844d7e14ae5705161a03613720d6d19cac323731ca8100bdb235619983fc678ca720f3cbbd9370815aac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a400000000000000000000000000000000000000",
@@ -440,8 +454,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0994514ec607a85f3c2f05acdc24e0e319a789bb0df39c65cf41e89485c20d79",
-        "network" : "Frontier",
+        "lastblockhash" : "0x03b8b1171560cf066164bcedf38f43f6b4c8563b933751639fa8d8b1681f708f",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51170",
@@ -566,10 +580,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d3g1v0_Homestead" : {
+    "RevertOpcodeReturn_d3g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d3g1v0Filler.json"
         },
         "blocks" : [
@@ -581,9 +595,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0x8a8df2fd648868c695bc125475ae2ed0641a7b098d9998a6abfce1740270c1db",
-                    "mixHash" : "0x312de79aadeef963523937aac70cb17c30c2415590019c0e7073e6943ffcc2f5",
-                    "nonce" : "0x97d5e78ebf8eff46",
+                    "hash" : "0xf5a2e2482d38a13bba2a08b6f6be1b4d04e434edf8d707cb99c411e211ec8884",
+                    "mixHash" : "0x7f5e19b089b98b6a39a959f2da4fff332a5064f679052ac0a08693f450016ec2",
+                    "nonce" : "0x63a7ca1233a33c71",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
                     "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
@@ -592,7 +606,7 @@
                     "transactionsTrie" : "0xb5230ffcf0ae2f6e3635764a3c2aa3869a6d9257d55acd68eeb7c9bb6bd47c20",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0b5230ffcf0ae2f6e3635764a3c2aa3869a6d9257d55acd68eeb7c9bb6bd47c20a00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0312de79aadeef963523937aac70cb17c30c2415590019c0e7073e6943ffcc2f58897d5e78ebf8eff46f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a4000000000000000000000000000000000000001ba0922e4414482634001824b186cfd0c50e30540d6e3c7cd59844d7e14ae5705161a03613720d6d19cac323731ca8100bdb235619983fc678ca720f3cbbd9370815aac0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0b5230ffcf0ae2f6e3635764a3c2aa3869a6d9257d55acd68eeb7c9bb6bd47c20a00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a07f5e19b089b98b6a39a959f2da4fff332a5064f679052ac0a08693f450016ec28863a7ca1233a33c71f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a4000000000000000000000000000000000000001ba0922e4414482634001824b186cfd0c50e30540d6e3c7cd59844d7e14ae5705161a03613720d6d19cac323731ca8100bdb235619983fc678ca720f3cbbd9370815aac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a400000000000000000000000000000000000000",
@@ -629,8 +643,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8a8df2fd648868c695bc125475ae2ed0641a7b098d9998a6abfce1740270c1db",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf5a2e2482d38a13bba2a08b6f6be1b4d04e434edf8d707cb99c411e211ec8884",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51170",
@@ -755,10 +769,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d3g1v0_Metropolis" : {
+    "RevertOpcodeReturn_d3g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d3g1v0Filler.json"
         },
         "blocks" : [
@@ -769,19 +783,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xcaf3",
-                    "hash" : "0xf3cd4aff66c5064eb9a857205d120969b8c54a03b95a636ea05b3f50f336a332",
-                    "mixHash" : "0x59c96fbde51165e0ad87846252eed26c412155a4f0fe6e0a544c5d0f862906a7",
-                    "nonce" : "0x4d3c7305b04be71f",
+                    "gasUsed" : "0x011170",
+                    "hash" : "0x3bc26b73b1ef73e227b9d7c546d38902d2ac2c51b7fa42c2c5b8dec33133aa8f",
+                    "mixHash" : "0x2cb05b3d7481590b44ef133fbbca5e1e00e9b46619788f833746b9ab2e1a6b46",
+                    "nonce" : "0xede6175da261f242",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0x018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7",
-                    "stateRoot" : "0x3ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8",
+                    "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
+                    "stateRoot" : "0xfcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb5230ffcf0ae2f6e3635764a3c2aa3869a6d9257d55acd68eeb7c9bb6bd47c20",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8a0b5230ffcf0ae2f6e3635764a3c2aa3869a6d9257d55acd68eeb7c9bb6bd47c20a0018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082caf38203e880a059c96fbde51165e0ad87846252eed26c412155a4f0fe6e0a544c5d0f862906a7884d3c7305b04be71ff882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a4000000000000000000000000000000000000001ba0922e4414482634001824b186cfd0c50e30540d6e3c7cd59844d7e14ae5705161a03613720d6d19cac323731ca8100bdb235619983fc678ca720f3cbbd9370815aac0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0b5230ffcf0ae2f6e3635764a3c2aa3869a6d9257d55acd68eeb7c9bb6bd47c20a00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a02cb05b3d7481590b44ef133fbbca5e1e00e9b46619788f833746b9ab2e1a6b4688ede6175da261f242f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a4000000000000000000000000000000000000001ba0922e4414482634001824b186cfd0c50e30540d6e3c7cd59844d7e14ae5705161a03613720d6d19cac323731ca8100bdb235619983fc678ca720f3cbbd9370815aac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a400000000000000000000000000000000000000",
@@ -818,18 +832,200 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf3cd4aff66c5064eb9a857205d120969b8c54a03b95a636ea05b3f50f336a332",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x3bc26b73b1ef73e227b9d7c546d38902d2ac2c51b7fa42c2c5b8dec33133aa8f",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f51170",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa500000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa600000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3fe90",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa500000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa600000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeReturn_d3g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d3g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x011170",
+                    "hash" : "0x653f961be6e22099e0d2ce9287d8f2d5d64f826b60e0867b2c6aacbb18a61999",
+                    "mixHash" : "0x00cacd88b43ffeb129a511cdc6408ab44119e6f95377d5dcb9086221794d9361",
+                    "nonce" : "0x3f31fc1b90b763cd",
+                    "number" : "0x01",
+                    "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
+                    "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
+                    "stateRoot" : "0xfcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb5230ffcf0ae2f6e3635764a3c2aa3869a6d9257d55acd68eeb7c9bb6bd47c20",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0b5230ffcf0ae2f6e3635764a3c2aa3869a6d9257d55acd68eeb7c9bb6bd47c20a00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a000cacd88b43ffeb129a511cdc6408ab44119e6f95377d5dcb9086221794d9361883f31fc1b90b763cdf882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a4000000000000000000000000000000000000001ba0922e4414482634001824b186cfd0c50e30540d6e3c7cd59844d7e14ae5705161a03613720d6d19cac323731ca8100bdb235619983fc678ca720f3cbbd9370815aac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a400000000000000000000000000000000000000",
+                        "gasLimit" : "0x011170",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x922e4414482634001824b186cfd0c50e30540d6e3c7cd59844d7e14ae5705161",
+                        "s" : "0x3613720d6d19cac323731ca8100bdb235619983fc678ca720f3cbbd9370815aa",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x653f961be6e22099e0d2ce9287d8f2d5d64f826b60e0867b2c6aacbb18a61999",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4caf3",
+                "balance" : "0x4563918244f51170",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -885,7 +1081,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a4450d",
+                "balance" : "0xe8d4a3fe90",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d4g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d4g0v0.json
index f9e68a558..e0e548232 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d4g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d4g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeReturn_d4g0v0_EIP150" : {
+    "RevertOpcodeReturn_d4g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d4g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x02c6ab",
-                    "hash" : "0x05212ed63b52b18ba0a709ccb5bcab1e3176b047151df36a51d72866be3b40b9",
-                    "mixHash" : "0x13033d6cdbc516fb5f02f89710ceba5ae0f32439625ff07179b4d751490aad1c",
-                    "nonce" : "0xfaf83ea0eb277a81",
+                    "gasUsed" : "0xcaf3",
+                    "hash" : "0xf6a744994ebd43636b09b1797867371ad6753722abf1b9a64f4c7ebacc3ff0b5",
+                    "mixHash" : "0x7ec8298482b39da089dcb6be2dabc9c02e78da516f6f0fd95f9efb996c4cd037",
+                    "nonce" : "0x843724671eae89e9",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0xc37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497",
-                    "stateRoot" : "0x5a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0",
+                    "receiptTrie" : "0x018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7",
+                    "stateRoot" : "0x3ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6e16130a2a67ff6d6d18770fd0a6bf2d0814b412636665e601787e484e34ac09",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0a06e16130a2a67ff6d6d18770fd0a6bf2d0814b412636665e601787e484e34ac09a0c37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a013033d6cdbc516fb5f02f89710ceba5ae0f32439625ff07179b4d751490aad1c88faf83ea0eb277a81f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a5000000000000000000000000000000000000001ca06f766b2795e91c1733cf5e52b202168318ff750645295e273523c5e06e0fa53ba016edcd8f78055bff0308a0dd1288b5b708837b9b87d5d5e4b0e5a34bf37b3b96c0",
+                "rlp" : "0xf9027ff901f7a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8a06e16130a2a67ff6d6d18770fd0a6bf2d0814b412636665e601787e484e34ac09a0018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082caf38203e880a07ec8298482b39da089dcb6be2dabc9c02e78da516f6f0fd95f9efb996c4cd03788843724671eae89e9f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a5000000000000000000000000000000000000001ca06f766b2795e91c1733cf5e52b202168318ff750645295e273523c5e06e0fa53ba016edcd8f78055bff0308a0dd1288b5b708837b9b87d5d5e4b0e5a34bf37b3b96c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a500000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x05212ed63b52b18ba0a709ccb5bcab1e3176b047151df36a51d72866be3b40b9",
-        "network" : "EIP150",
+        "lastblockhash" : "0xf6a744994ebd43636b09b1797867371ad6753722abf1b9a64f4c7ebacc3ff0b5",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f6c6ab",
+                "balance" : "0x4563918244f4caf3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -122,7 +129,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a24955",
+                "balance" : "0xe8d4a4450d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -188,10 +195,206 @@
             }
         }
     },
-    "RevertOpcodeReturn_d4g0v0_EIP158" : {
+    "RevertOpcodeReturn_d4g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d4g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xcaf3",
+                    "hash" : "0x4b7943636934d36fd107df3d13bb40a2a63603ed673f4af7dd0d94735434346b",
+                    "mixHash" : "0x759d3dc3db67b9f2e06bfb3466949817981bc447c13bd65f08b37eb3da605fb1",
+                    "nonce" : "0xea83510c3089cf38",
+                    "number" : "0x01",
+                    "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
+                    "receiptTrie" : "0x018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7",
+                    "stateRoot" : "0x3ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6e16130a2a67ff6d6d18770fd0a6bf2d0814b412636665e601787e484e34ac09",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9027ff901f7a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8a06e16130a2a67ff6d6d18770fd0a6bf2d0814b412636665e601787e484e34ac09a0018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082caf38203e880a0759d3dc3db67b9f2e06bfb3466949817981bc447c13bd65f08b37eb3da605fb188ea83510c3089cf38f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a5000000000000000000000000000000000000001ca06f766b2795e91c1733cf5e52b202168318ff750645295e273523c5e06e0fa53ba016edcd8f78055bff0308a0dd1288b5b708837b9b87d5d5e4b0e5a34bf37b3b96c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a500000000000000000000000000000000000000",
+                        "gasLimit" : "0x0c3500",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6f766b2795e91c1733cf5e52b202168318ff750645295e273523c5e06e0fa53b",
+                        "s" : "0x16edcd8f78055bff0308a0dd1288b5b708837b9b87d5d5e4b0e5a34bf37b3b96",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4b7943636934d36fd107df3d13bb40a2a63603ed673f4af7dd0d94735434346b",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4caf3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa500000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa600000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a4450d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa500000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa600000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeReturn_d4g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d4g0v0Filler.json"
         },
         "blocks" : [
@@ -203,9 +406,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c6ab",
-                    "hash" : "0x7bd364681f95b605932081c4f6aff2d51ba1de01017054ff2dc4d357e25ca16a",
-                    "mixHash" : "0x58f8761d29b88bd3e0c5fee4acd58a6407b9c8d35ccb84376fd37173f2b4d682",
-                    "nonce" : "0xbb680810c64dd225",
+                    "hash" : "0xdf9b202725a4682bd65e2cd8d0dce97ea16a258138dc8fa82b5aa879c90c3d8e",
+                    "mixHash" : "0xd52b6cffde5049089515e6628893c4f5b62d07118687138517821104163e2706",
+                    "nonce" : "0x44d03abf217402b4",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
                     "receiptTrie" : "0xc37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497",
@@ -214,7 +417,7 @@
                     "transactionsTrie" : "0x6e16130a2a67ff6d6d18770fd0a6bf2d0814b412636665e601787e484e34ac09",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0a06e16130a2a67ff6d6d18770fd0a6bf2d0814b412636665e601787e484e34ac09a0c37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a058f8761d29b88bd3e0c5fee4acd58a6407b9c8d35ccb84376fd37173f2b4d68288bb680810c64dd225f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a5000000000000000000000000000000000000001ca06f766b2795e91c1733cf5e52b202168318ff750645295e273523c5e06e0fa53ba016edcd8f78055bff0308a0dd1288b5b708837b9b87d5d5e4b0e5a34bf37b3b96c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0a06e16130a2a67ff6d6d18770fd0a6bf2d0814b412636665e601787e484e34ac09a0c37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a0d52b6cffde5049089515e6628893c4f5b62d07118687138517821104163e27068844d03abf217402b4f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a5000000000000000000000000000000000000001ca06f766b2795e91c1733cf5e52b202168318ff750645295e273523c5e06e0fa53ba016edcd8f78055bff0308a0dd1288b5b708837b9b87d5d5e4b0e5a34bf37b3b96c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a500000000000000000000000000000000000000",
@@ -251,8 +454,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7bd364681f95b605932081c4f6aff2d51ba1de01017054ff2dc4d357e25ca16a",
-        "network" : "EIP158",
+        "lastblockhash" : "0xdf9b202725a4682bd65e2cd8d0dce97ea16a258138dc8fa82b5aa879c90c3d8e",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c6ab",
@@ -377,10 +580,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d4g0v0_Frontier" : {
+    "RevertOpcodeReturn_d4g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d4g0v0Filler.json"
         },
         "blocks" : [
@@ -391,19 +594,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x02c417",
-                    "hash" : "0xde9654ce45f34aa12be18e148d55943de8aecf339eb1546ea7249f3abe76eb39",
-                    "mixHash" : "0x4f1e5b07a586bdba87538a79e4c739ffb61cdfb4917935470e912b4158b5131d",
-                    "nonce" : "0x550654ff743fb6a4",
+                    "gasUsed" : "0x02c6ab",
+                    "hash" : "0xb3b54023e36f805a6514cff009fff708b41d7d0b3283ce101036c1ca6cf16940",
+                    "mixHash" : "0x70870e95e7a48e3579fa038d0838f66cfd6b862d92d1e8e9382dd9a5effcf84c",
+                    "nonce" : "0xb25aa364debde673",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0xf0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73b",
-                    "stateRoot" : "0x341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15f",
+                    "receiptTrie" : "0xc37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497",
+                    "stateRoot" : "0x5a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6e16130a2a67ff6d6d18770fd0a6bf2d0814b412636665e601787e484e34ac09",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15fa06e16130a2a67ff6d6d18770fd0a6bf2d0814b412636665e601787e484e34ac09a0f0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c4178203e880a04f1e5b07a586bdba87538a79e4c739ffb61cdfb4917935470e912b4158b5131d88550654ff743fb6a4f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a5000000000000000000000000000000000000001ca06f766b2795e91c1733cf5e52b202168318ff750645295e273523c5e06e0fa53ba016edcd8f78055bff0308a0dd1288b5b708837b9b87d5d5e4b0e5a34bf37b3b96c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0a06e16130a2a67ff6d6d18770fd0a6bf2d0814b412636665e601787e484e34ac09a0c37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a070870e95e7a48e3579fa038d0838f66cfd6b862d92d1e8e9382dd9a5effcf84c88b25aa364debde673f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a5000000000000000000000000000000000000001ca06f766b2795e91c1733cf5e52b202168318ff750645295e273523c5e06e0fa53ba016edcd8f78055bff0308a0dd1288b5b708837b9b87d5d5e4b0e5a34bf37b3b96c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a500000000000000000000000000000000000000",
@@ -440,11 +643,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xde9654ce45f34aa12be18e148d55943de8aecf339eb1546ea7249f3abe76eb39",
-        "network" : "Frontier",
+        "lastblockhash" : "0xb3b54023e36f805a6514cff009fff708b41d7d0b3283ce101036c1ca6cf16940",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f6c417",
+                "balance" : "0x4563918244f6c6ab",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -500,7 +703,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a24be9",
+                "balance" : "0xe8d4a24955",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -566,10 +769,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d4g0v0_Homestead" : {
+    "RevertOpcodeReturn_d4g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d4g0v0Filler.json"
         },
         "blocks" : [
@@ -581,9 +784,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c417",
-                    "hash" : "0x5ed55bf2f9491aabf8b66bba790da19ce8f9605b9ed83a3112c04cb91b4ffc15",
-                    "mixHash" : "0x0f46332e3b655322b04d32e577c25eb2ed275906b0d57aef9d21a96cb5ec9fc1",
-                    "nonce" : "0x3b8d0cf389b0fb14",
+                    "hash" : "0xff4094d32a4cebcbf659b2ffcdab0e9bd09da4d6656627a9b90a00a7f993cb16",
+                    "mixHash" : "0xa9e1cbccff9d6389601aad9426ea685aa3b5e2986f97ec1a5f8d6c2fbe1b355e",
+                    "nonce" : "0xcb03b0a62656aa09",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
                     "receiptTrie" : "0xf0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73b",
@@ -592,7 +795,7 @@
                     "transactionsTrie" : "0x6e16130a2a67ff6d6d18770fd0a6bf2d0814b412636665e601787e484e34ac09",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15fa06e16130a2a67ff6d6d18770fd0a6bf2d0814b412636665e601787e484e34ac09a0f0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c4178203e880a00f46332e3b655322b04d32e577c25eb2ed275906b0d57aef9d21a96cb5ec9fc1883b8d0cf389b0fb14f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a5000000000000000000000000000000000000001ca06f766b2795e91c1733cf5e52b202168318ff750645295e273523c5e06e0fa53ba016edcd8f78055bff0308a0dd1288b5b708837b9b87d5d5e4b0e5a34bf37b3b96c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15fa06e16130a2a67ff6d6d18770fd0a6bf2d0814b412636665e601787e484e34ac09a0f0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c4178203e880a0a9e1cbccff9d6389601aad9426ea685aa3b5e2986f97ec1a5f8d6c2fbe1b355e88cb03b0a62656aa09f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a5000000000000000000000000000000000000001ca06f766b2795e91c1733cf5e52b202168318ff750645295e273523c5e06e0fa53ba016edcd8f78055bff0308a0dd1288b5b708837b9b87d5d5e4b0e5a34bf37b3b96c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a500000000000000000000000000000000000000",
@@ -629,8 +832,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5ed55bf2f9491aabf8b66bba790da19ce8f9605b9ed83a3112c04cb91b4ffc15",
-        "network" : "Homestead",
+        "lastblockhash" : "0xff4094d32a4cebcbf659b2ffcdab0e9bd09da4d6656627a9b90a00a7f993cb16",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c417",
@@ -755,10 +958,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d4g0v0_Metropolis" : {
+    "RevertOpcodeReturn_d4g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d4g0v0Filler.json"
         },
         "blocks" : [
@@ -769,19 +972,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xcaf3",
-                    "hash" : "0x81afc339d26517ee8bbbdfb29ec98b24c4fdddb4ae1cd9e39129e0e978664c0b",
-                    "mixHash" : "0xf36f11539e5c9e1f71658a038b4f270ac9bdbc807991e053a66013be11215267",
-                    "nonce" : "0xd1b0a5371048ea7f",
+                    "gasUsed" : "0x02c417",
+                    "hash" : "0x1a57b5cc20e163099197a84b191ffb607c3c290ca585d37ebdb36d08bf7d0383",
+                    "mixHash" : "0x3e9c3d84949fac7e385bc19d21714c40ef9377b209c2516a8cc33c0620e1031e",
+                    "nonce" : "0x88194a99a1a2259f",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0x018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7",
-                    "stateRoot" : "0x3ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8",
+                    "receiptTrie" : "0xf0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73b",
+                    "stateRoot" : "0x341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6e16130a2a67ff6d6d18770fd0a6bf2d0814b412636665e601787e484e34ac09",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8a06e16130a2a67ff6d6d18770fd0a6bf2d0814b412636665e601787e484e34ac09a0018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082caf38203e880a0f36f11539e5c9e1f71658a038b4f270ac9bdbc807991e053a66013be1121526788d1b0a5371048ea7ff882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a5000000000000000000000000000000000000001ca06f766b2795e91c1733cf5e52b202168318ff750645295e273523c5e06e0fa53ba016edcd8f78055bff0308a0dd1288b5b708837b9b87d5d5e4b0e5a34bf37b3b96c0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15fa06e16130a2a67ff6d6d18770fd0a6bf2d0814b412636665e601787e484e34ac09a0f0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c4178203e880a03e9c3d84949fac7e385bc19d21714c40ef9377b209c2516a8cc33c0620e1031e8888194a99a1a2259ff882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a5000000000000000000000000000000000000001ca06f766b2795e91c1733cf5e52b202168318ff750645295e273523c5e06e0fa53ba016edcd8f78055bff0308a0dd1288b5b708837b9b87d5d5e4b0e5a34bf37b3b96c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a500000000000000000000000000000000000000",
@@ -818,18 +1021,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x81afc339d26517ee8bbbdfb29ec98b24c4fdddb4ae1cd9e39129e0e978664c0b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x1a57b5cc20e163099197a84b191ffb607c3c290ca585d37ebdb36d08bf7d0383",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4caf3",
+                "balance" : "0x4563918244f6c417",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -885,7 +1081,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a4450d",
+                "balance" : "0xe8d4a24be9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d4g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d4g1v0.json
index b99b1d252..47dac9452 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d4g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d4g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeReturn_d4g1v0_EIP150" : {
+    "RevertOpcodeReturn_d4g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d4g1v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x011170",
-                    "hash" : "0x6d268b5b8d445ab51bee8c94155d1235e9d9c6d37afcab290f51debd7f5ff684",
-                    "mixHash" : "0x7e0e24dce5b171202923206ce7ddbc2409a29ac7a1f25734f78e3cc8e4d8aeb6",
-                    "nonce" : "0xf08f9aa3b7618e16",
+                    "gasUsed" : "0xcaf3",
+                    "hash" : "0x6bfde54af479e35e1c82dc4581b8424995d32d5ff541cf4c94dce1b17feb8f73",
+                    "mixHash" : "0xbd241a38ab8f01db61ac7e797c8af0413d1174df57bed5e225aeada618c7cb38",
+                    "nonce" : "0x92a57f3742f5d011",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
-                    "stateRoot" : "0xfcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660f",
+                    "receiptTrie" : "0x018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7",
+                    "stateRoot" : "0x3ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6587e82edd4cc11ba3b5a5e8da27455ddb4d8815f9acdb4f8c542b9ed22898ac",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa06587e82edd4cc11ba3b5a5e8da27455ddb4d8815f9acdb4f8c542b9ed22898aca00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a07e0e24dce5b171202923206ce7ddbc2409a29ac7a1f25734f78e3cc8e4d8aeb688f08f9aa3b7618e16f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a5000000000000000000000000000000000000001ca0833caa769cf3a5f06ae4d7ddf0e50ee38058540671b61998f6be9d116184dc03a0505ec10b0c2c7c61b6ea2e1b20e921b142d4255cca0cd2c3a71f5bb7adf9a0dac0",
+                "rlp" : "0xf9027ff901f7a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8a06587e82edd4cc11ba3b5a5e8da27455ddb4d8815f9acdb4f8c542b9ed22898aca0018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082caf38203e880a0bd241a38ab8f01db61ac7e797c8af0413d1174df57bed5e225aeada618c7cb388892a57f3742f5d011f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a5000000000000000000000000000000000000001ca0833caa769cf3a5f06ae4d7ddf0e50ee38058540671b61998f6be9d116184dc03a0505ec10b0c2c7c61b6ea2e1b20e921b142d4255cca0cd2c3a71f5bb7adf9a0dac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a500000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6d268b5b8d445ab51bee8c94155d1235e9d9c6d37afcab290f51debd7f5ff684",
-        "network" : "EIP150",
+        "lastblockhash" : "0x6bfde54af479e35e1c82dc4581b8424995d32d5ff541cf4c94dce1b17feb8f73",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51170",
+                "balance" : "0x4563918244f4caf3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -122,7 +129,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3fe90",
+                "balance" : "0xe8d4a4450d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -188,10 +195,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d4g1v0_EIP158" : {
+    "RevertOpcodeReturn_d4g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d4g1v0Filler.json"
         },
         "blocks" : [
@@ -202,19 +209,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x011170",
-                    "hash" : "0x909858a83b942f0abe976dcb71aaaa1888b6deacf302d6b8d7fdfc723f7dd162",
-                    "mixHash" : "0x9ac50e74eb3df243e9764293f3bda63b111f1a3b373056f0694f744ac4fc8fe6",
-                    "nonce" : "0xb46be6c8655bcef7",
+                    "gasUsed" : "0xcaf3",
+                    "hash" : "0x14391d1a90364e0fc473806b6849e35159f68c5b8a85e494cd1b800fa3c3235e",
+                    "mixHash" : "0x66a1596baf4fc6b4b50cd67b5409246d7be4cd17447d1d40bf9a6efec51a7765",
+                    "nonce" : "0x631a81ae1835c15a",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
-                    "stateRoot" : "0xfcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660f",
+                    "receiptTrie" : "0x018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7",
+                    "stateRoot" : "0x3ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6587e82edd4cc11ba3b5a5e8da27455ddb4d8815f9acdb4f8c542b9ed22898ac",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa06587e82edd4cc11ba3b5a5e8da27455ddb4d8815f9acdb4f8c542b9ed22898aca00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a09ac50e74eb3df243e9764293f3bda63b111f1a3b373056f0694f744ac4fc8fe688b46be6c8655bcef7f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a5000000000000000000000000000000000000001ca0833caa769cf3a5f06ae4d7ddf0e50ee38058540671b61998f6be9d116184dc03a0505ec10b0c2c7c61b6ea2e1b20e921b142d4255cca0cd2c3a71f5bb7adf9a0dac0",
+                "rlp" : "0xf9027ff901f7a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8a06587e82edd4cc11ba3b5a5e8da27455ddb4d8815f9acdb4f8c542b9ed22898aca0018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082caf38203e880a066a1596baf4fc6b4b50cd67b5409246d7be4cd17447d1d40bf9a6efec51a776588631a81ae1835c15af882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a5000000000000000000000000000000000000001ca0833caa769cf3a5f06ae4d7ddf0e50ee38058540671b61998f6be9d116184dc03a0505ec10b0c2c7c61b6ea2e1b20e921b142d4255cca0cd2c3a71f5bb7adf9a0dac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a500000000000000000000000000000000000000",
@@ -251,11 +258,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x909858a83b942f0abe976dcb71aaaa1888b6deacf302d6b8d7fdfc723f7dd162",
-        "network" : "EIP158",
+        "lastblockhash" : "0x14391d1a90364e0fc473806b6849e35159f68c5b8a85e494cd1b800fa3c3235e",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51170",
+                "balance" : "0x4563918244f4caf3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -311,7 +325,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3fe90",
+                "balance" : "0xe8d4a4450d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -377,10 +391,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d4g1v0_Frontier" : {
+    "RevertOpcodeReturn_d4g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d4g1v0Filler.json"
         },
         "blocks" : [
@@ -392,9 +406,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0xf84f023037c97e8275b051a6fceed539b147f2dbd727d0744c519cbe4981d318",
-                    "mixHash" : "0xd8ba2e3575332c9bfd907b4366f220c28fbcfd499db08fdb277892092867893b",
-                    "nonce" : "0xf559785a644f1693",
+                    "hash" : "0xec5facce332812283270818cfa1fbdec8fa9c715f8751a7575501b5b356fd87e",
+                    "mixHash" : "0xb3b1fd0c69cb2b91ec3aac2e6bedfc4cdcf754803b30a38ebb3f8824cb1c607c",
+                    "nonce" : "0x5a893f1240dd2c41",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
                     "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
@@ -403,7 +417,7 @@
                     "transactionsTrie" : "0x6587e82edd4cc11ba3b5a5e8da27455ddb4d8815f9acdb4f8c542b9ed22898ac",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa06587e82edd4cc11ba3b5a5e8da27455ddb4d8815f9acdb4f8c542b9ed22898aca00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0d8ba2e3575332c9bfd907b4366f220c28fbcfd499db08fdb277892092867893b88f559785a644f1693f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a5000000000000000000000000000000000000001ca0833caa769cf3a5f06ae4d7ddf0e50ee38058540671b61998f6be9d116184dc03a0505ec10b0c2c7c61b6ea2e1b20e921b142d4255cca0cd2c3a71f5bb7adf9a0dac0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa06587e82edd4cc11ba3b5a5e8da27455ddb4d8815f9acdb4f8c542b9ed22898aca00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0b3b1fd0c69cb2b91ec3aac2e6bedfc4cdcf754803b30a38ebb3f8824cb1c607c885a893f1240dd2c41f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a5000000000000000000000000000000000000001ca0833caa769cf3a5f06ae4d7ddf0e50ee38058540671b61998f6be9d116184dc03a0505ec10b0c2c7c61b6ea2e1b20e921b142d4255cca0cd2c3a71f5bb7adf9a0dac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a500000000000000000000000000000000000000",
@@ -440,8 +454,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf84f023037c97e8275b051a6fceed539b147f2dbd727d0744c519cbe4981d318",
-        "network" : "Frontier",
+        "lastblockhash" : "0xec5facce332812283270818cfa1fbdec8fa9c715f8751a7575501b5b356fd87e",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51170",
@@ -566,10 +580,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d4g1v0_Homestead" : {
+    "RevertOpcodeReturn_d4g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d4g1v0Filler.json"
         },
         "blocks" : [
@@ -581,9 +595,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0x531be6df7056c67569b5c088d20e0e4e6b21b3decbc1f20a92c8d5fb60d6a96f",
-                    "mixHash" : "0xb5ee2669be19872e3dbbe48c5d18a95e85ac1a45331cd2e7292cc0b0fc5ef5c3",
-                    "nonce" : "0xb82cfb83d6cb1e2c",
+                    "hash" : "0x3c8e13bb1c841987358363ecd080104f2a16e474a6b202f621aed3204b843efc",
+                    "mixHash" : "0x1d29e92e8d7df2c628f8ac9a1be2808d8964d8f9e074977b79057e03c33f7b0c",
+                    "nonce" : "0xbb2ab60e675b6110",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
                     "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
@@ -592,7 +606,7 @@
                     "transactionsTrie" : "0x6587e82edd4cc11ba3b5a5e8da27455ddb4d8815f9acdb4f8c542b9ed22898ac",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa06587e82edd4cc11ba3b5a5e8da27455ddb4d8815f9acdb4f8c542b9ed22898aca00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0b5ee2669be19872e3dbbe48c5d18a95e85ac1a45331cd2e7292cc0b0fc5ef5c388b82cfb83d6cb1e2cf882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a5000000000000000000000000000000000000001ca0833caa769cf3a5f06ae4d7ddf0e50ee38058540671b61998f6be9d116184dc03a0505ec10b0c2c7c61b6ea2e1b20e921b142d4255cca0cd2c3a71f5bb7adf9a0dac0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa06587e82edd4cc11ba3b5a5e8da27455ddb4d8815f9acdb4f8c542b9ed22898aca00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a01d29e92e8d7df2c628f8ac9a1be2808d8964d8f9e074977b79057e03c33f7b0c88bb2ab60e675b6110f882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a5000000000000000000000000000000000000001ca0833caa769cf3a5f06ae4d7ddf0e50ee38058540671b61998f6be9d116184dc03a0505ec10b0c2c7c61b6ea2e1b20e921b142d4255cca0cd2c3a71f5bb7adf9a0dac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a500000000000000000000000000000000000000",
@@ -629,8 +643,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x531be6df7056c67569b5c088d20e0e4e6b21b3decbc1f20a92c8d5fb60d6a96f",
-        "network" : "Homestead",
+        "lastblockhash" : "0x3c8e13bb1c841987358363ecd080104f2a16e474a6b202f621aed3204b843efc",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51170",
@@ -755,10 +769,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d4g1v0_Metropolis" : {
+    "RevertOpcodeReturn_d4g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d4g1v0Filler.json"
         },
         "blocks" : [
@@ -769,19 +783,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xcaf3",
-                    "hash" : "0xe5c77b5fef430f7d2ba621f854b0e48f5fcb77c8bfb73f73660db756678b6238",
-                    "mixHash" : "0xd5253d154017f0a555002c85aa1578652aecaf482fb443bb9efb6ff23eeec122",
-                    "nonce" : "0x528b8f14da08119d",
+                    "gasUsed" : "0x011170",
+                    "hash" : "0x3ac3f5a3b21da3acb87b7d366bc11778b9033428b3bec3c7a1a838efd827fd26",
+                    "mixHash" : "0x7bb6487cbb131b0e5fc6e34e77031b118122dbcfeb06d82d94a5f33063884302",
+                    "nonce" : "0x8977790d91976a2d",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0x018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7",
-                    "stateRoot" : "0x3ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8",
+                    "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
+                    "stateRoot" : "0xfcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6587e82edd4cc11ba3b5a5e8da27455ddb4d8815f9acdb4f8c542b9ed22898ac",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8a06587e82edd4cc11ba3b5a5e8da27455ddb4d8815f9acdb4f8c542b9ed22898aca0018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082caf38203e880a0d5253d154017f0a555002c85aa1578652aecaf482fb443bb9efb6ff23eeec12288528b8f14da08119df882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a5000000000000000000000000000000000000001ca0833caa769cf3a5f06ae4d7ddf0e50ee38058540671b61998f6be9d116184dc03a0505ec10b0c2c7c61b6ea2e1b20e921b142d4255cca0cd2c3a71f5bb7adf9a0dac0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa06587e82edd4cc11ba3b5a5e8da27455ddb4d8815f9acdb4f8c542b9ed22898aca00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a07bb6487cbb131b0e5fc6e34e77031b118122dbcfeb06d82d94a5f33063884302888977790d91976a2df882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a5000000000000000000000000000000000000001ca0833caa769cf3a5f06ae4d7ddf0e50ee38058540671b61998f6be9d116184dc03a0505ec10b0c2c7c61b6ea2e1b20e921b142d4255cca0cd2c3a71f5bb7adf9a0dac0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a500000000000000000000000000000000000000",
@@ -818,18 +832,200 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe5c77b5fef430f7d2ba621f854b0e48f5fcb77c8bfb73f73660db756678b6238",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x3ac3f5a3b21da3acb87b7d366bc11778b9033428b3bec3c7a1a838efd827fd26",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f51170",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa500000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa600000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3fe90",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa500000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa600000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeReturn_d4g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d4g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x011170",
+                    "hash" : "0xe6a7a885b19ba83e91a4e8f0ebd5b00179b7e89d2ed8a38fb2feaffd1b437000",
+                    "mixHash" : "0x5be2f7c9015b9c3ecabd5d8bf562c166a092c2799a3ee76d05060b36bbf7cb94",
+                    "nonce" : "0x267c9b8292716dac",
+                    "number" : "0x01",
+                    "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
+                    "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
+                    "stateRoot" : "0xfcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6587e82edd4cc11ba3b5a5e8da27455ddb4d8815f9acdb4f8c542b9ed22898ac",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa06587e82edd4cc11ba3b5a5e8da27455ddb4d8815f9acdb4f8c542b9ed22898aca00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a05be2f7c9015b9c3ecabd5d8bf562c166a092c2799a3ee76d05060b36bbf7cb9488267c9b8292716dacf882f88080018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a5000000000000000000000000000000000000001ca0833caa769cf3a5f06ae4d7ddf0e50ee38058540671b61998f6be9d116184dc03a0505ec10b0c2c7c61b6ea2e1b20e921b142d4255cca0cd2c3a71f5bb7adf9a0dac0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a500000000000000000000000000000000000000",
+                        "gasLimit" : "0x011170",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x833caa769cf3a5f06ae4d7ddf0e50ee38058540671b61998f6be9d116184dc03",
+                        "s" : "0x505ec10b0c2c7c61b6ea2e1b20e921b142d4255cca0cd2c3a71f5bb7adf9a0da",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe6a7a885b19ba83e91a4e8f0ebd5b00179b7e89d2ed8a38fb2feaffd1b437000",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4caf3",
+                "balance" : "0x4563918244f51170",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -885,7 +1081,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a4450d",
+                "balance" : "0xe8d4a3fe90",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d5g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d5g0v0.json
index fbe8a0b0b..d6ac835b1 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d5g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d5g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeReturn_d5g0v0_EIP150" : {
+    "RevertOpcodeReturn_d5g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d5g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x02c6ab",
-                    "hash" : "0x0433ba804b853f967152290e1d25450446b0ffd5c303f7388c1694071d97af66",
-                    "mixHash" : "0xc290c75b64f3ce9c1390f00b0bbcf285726ae49becfea08285ac72deba6e41ff",
-                    "nonce" : "0xbaa7ba2828f74c10",
+                    "gasUsed" : "0xcaf3",
+                    "hash" : "0x4333120355a575b5e064c60c664845e4615c4de92a5668be9726574668eb853b",
+                    "mixHash" : "0xee22c68f6af0be610bda0b641b8320bbe1b597bf14176f0d4d1b0315af38b0c4",
+                    "nonce" : "0xa9f027e2bd53869d",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0xc37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497",
-                    "stateRoot" : "0x5a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0",
+                    "receiptTrie" : "0x018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7",
+                    "stateRoot" : "0x3ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x518c9be3cef31f3bebf740e54400d02ef7a9c4105101f9b33925387ac3c0e053",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0a0518c9be3cef31f3bebf740e54400d02ef7a9c4105101f9b33925387ac3c0e053a0c37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a0c290c75b64f3ce9c1390f00b0bbcf285726ae49becfea08285ac72deba6e41ff88baa7ba2828f74c10f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a6000000000000000000000000000000000000001ca026af0d2b4e8c8be9521976c00b05d9731980746bc66d45c9b39b6d03c9abd22ea033e5e8dd8a1846f471ca18c59438ef2c588a7f6754c98e0a565729ed2f1c1d0fc0",
+                "rlp" : "0xf9027ff901f7a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8a0518c9be3cef31f3bebf740e54400d02ef7a9c4105101f9b33925387ac3c0e053a0018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082caf38203e880a0ee22c68f6af0be610bda0b641b8320bbe1b597bf14176f0d4d1b0315af38b0c488a9f027e2bd53869df882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a6000000000000000000000000000000000000001ca026af0d2b4e8c8be9521976c00b05d9731980746bc66d45c9b39b6d03c9abd22ea033e5e8dd8a1846f471ca18c59438ef2c588a7f6754c98e0a565729ed2f1c1d0fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a600000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0433ba804b853f967152290e1d25450446b0ffd5c303f7388c1694071d97af66",
-        "network" : "EIP150",
+        "lastblockhash" : "0x4333120355a575b5e064c60c664845e4615c4de92a5668be9726574668eb853b",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f6c6ab",
+                "balance" : "0x4563918244f4caf3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -122,7 +129,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a24955",
+                "balance" : "0xe8d4a4450d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -188,10 +195,206 @@
             }
         }
     },
-    "RevertOpcodeReturn_d5g0v0_EIP158" : {
+    "RevertOpcodeReturn_d5g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d5g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xcaf3",
+                    "hash" : "0xa1c01ad9db306354b525090db7454e73839fa336e45dd64f3eb5204b84f6ba9d",
+                    "mixHash" : "0x9ab94c67d691d697fe3c3358c98f400ffd2a1c3666431c0b9a583ffbb0cc88fe",
+                    "nonce" : "0xbdffc08c88971a2c",
+                    "number" : "0x01",
+                    "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
+                    "receiptTrie" : "0x018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7",
+                    "stateRoot" : "0x3ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x518c9be3cef31f3bebf740e54400d02ef7a9c4105101f9b33925387ac3c0e053",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9027ff901f7a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8a0518c9be3cef31f3bebf740e54400d02ef7a9c4105101f9b33925387ac3c0e053a0018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082caf38203e880a09ab94c67d691d697fe3c3358c98f400ffd2a1c3666431c0b9a583ffbb0cc88fe88bdffc08c88971a2cf882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a6000000000000000000000000000000000000001ca026af0d2b4e8c8be9521976c00b05d9731980746bc66d45c9b39b6d03c9abd22ea033e5e8dd8a1846f471ca18c59438ef2c588a7f6754c98e0a565729ed2f1c1d0fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a600000000000000000000000000000000000000",
+                        "gasLimit" : "0x0c3500",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x26af0d2b4e8c8be9521976c00b05d9731980746bc66d45c9b39b6d03c9abd22e",
+                        "s" : "0x33e5e8dd8a1846f471ca18c59438ef2c588a7f6754c98e0a565729ed2f1c1d0f",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa1c01ad9db306354b525090db7454e73839fa336e45dd64f3eb5204b84f6ba9d",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4caf3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa500000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa600000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a4450d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa500000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa600000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeReturn_d5g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d5g0v0Filler.json"
         },
         "blocks" : [
@@ -203,9 +406,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c6ab",
-                    "hash" : "0xe8d971bc7f252d5b18bb24126a7d91698dcf9034ab85108d9b2271cd9703fbc4",
-                    "mixHash" : "0xe022a57a8931fbd38ac10a00b4e43f0df5ffd3a45f1cc700891fa8ae722e2d7b",
-                    "nonce" : "0x0bf2fabdcd1646f6",
+                    "hash" : "0xb0ac93062276267e753bea6a299e13842975eeaf7d38d32e0565121b0bbd49f6",
+                    "mixHash" : "0x582357a652ec2ca03aa70133675978aebed7ceb0b97a403fb11cd889a9f66923",
+                    "nonce" : "0x23bf1ad2c3a225a9",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
                     "receiptTrie" : "0xc37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497",
@@ -214,7 +417,7 @@
                     "transactionsTrie" : "0x518c9be3cef31f3bebf740e54400d02ef7a9c4105101f9b33925387ac3c0e053",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0a0518c9be3cef31f3bebf740e54400d02ef7a9c4105101f9b33925387ac3c0e053a0c37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a0e022a57a8931fbd38ac10a00b4e43f0df5ffd3a45f1cc700891fa8ae722e2d7b880bf2fabdcd1646f6f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a6000000000000000000000000000000000000001ca026af0d2b4e8c8be9521976c00b05d9731980746bc66d45c9b39b6d03c9abd22ea033e5e8dd8a1846f471ca18c59438ef2c588a7f6754c98e0a565729ed2f1c1d0fc0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0a0518c9be3cef31f3bebf740e54400d02ef7a9c4105101f9b33925387ac3c0e053a0c37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a0582357a652ec2ca03aa70133675978aebed7ceb0b97a403fb11cd889a9f669238823bf1ad2c3a225a9f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a6000000000000000000000000000000000000001ca026af0d2b4e8c8be9521976c00b05d9731980746bc66d45c9b39b6d03c9abd22ea033e5e8dd8a1846f471ca18c59438ef2c588a7f6754c98e0a565729ed2f1c1d0fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a600000000000000000000000000000000000000",
@@ -251,8 +454,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe8d971bc7f252d5b18bb24126a7d91698dcf9034ab85108d9b2271cd9703fbc4",
-        "network" : "EIP158",
+        "lastblockhash" : "0xb0ac93062276267e753bea6a299e13842975eeaf7d38d32e0565121b0bbd49f6",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c6ab",
@@ -377,10 +580,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d5g0v0_Frontier" : {
+    "RevertOpcodeReturn_d5g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d5g0v0Filler.json"
         },
         "blocks" : [
@@ -391,19 +594,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x02c417",
-                    "hash" : "0x7cf302359eb64169220eb2b5aca3e13e08078cbde624076c22fb2f8d0af82853",
-                    "mixHash" : "0x69e618217f30c23ea086cb2a86932421c07a83eb194ed4914c1b9aadead071bd",
-                    "nonce" : "0x69cef39d9e771ae7",
+                    "gasUsed" : "0x02c6ab",
+                    "hash" : "0xd921a0b338146f104f5c2ef28278bc9799d54208fdf7612e9339b0b215b3911b",
+                    "mixHash" : "0x63e73b465430430f5e9436c3ac665fd72943c3ec592e7ecea97bc7218c54c5d8",
+                    "nonce" : "0x156dd30e7d92e967",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0xf0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73b",
-                    "stateRoot" : "0x341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15f",
+                    "receiptTrie" : "0xc37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497",
+                    "stateRoot" : "0x5a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x518c9be3cef31f3bebf740e54400d02ef7a9c4105101f9b33925387ac3c0e053",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15fa0518c9be3cef31f3bebf740e54400d02ef7a9c4105101f9b33925387ac3c0e053a0f0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c4178203e880a069e618217f30c23ea086cb2a86932421c07a83eb194ed4914c1b9aadead071bd8869cef39d9e771ae7f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a6000000000000000000000000000000000000001ca026af0d2b4e8c8be9521976c00b05d9731980746bc66d45c9b39b6d03c9abd22ea033e5e8dd8a1846f471ca18c59438ef2c588a7f6754c98e0a565729ed2f1c1d0fc0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a99ca55768c15c98366a4a88a23918ee62fd4f7f9ab29eb0fd2c7366a40ccc0a0518c9be3cef31f3bebf740e54400d02ef7a9c4105101f9b33925387ac3c0e053a0c37f81eba49a26797028f74e2b9695ad9623d9ba6432b6befda5cc18275fb497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c6ab8203e880a063e73b465430430f5e9436c3ac665fd72943c3ec592e7ecea97bc7218c54c5d888156dd30e7d92e967f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a6000000000000000000000000000000000000001ca026af0d2b4e8c8be9521976c00b05d9731980746bc66d45c9b39b6d03c9abd22ea033e5e8dd8a1846f471ca18c59438ef2c588a7f6754c98e0a565729ed2f1c1d0fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a600000000000000000000000000000000000000",
@@ -440,11 +643,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7cf302359eb64169220eb2b5aca3e13e08078cbde624076c22fb2f8d0af82853",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd921a0b338146f104f5c2ef28278bc9799d54208fdf7612e9339b0b215b3911b",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f6c417",
+                "balance" : "0x4563918244f6c6ab",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -500,7 +703,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a24be9",
+                "balance" : "0xe8d4a24955",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -566,10 +769,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d5g0v0_Homestead" : {
+    "RevertOpcodeReturn_d5g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d5g0v0Filler.json"
         },
         "blocks" : [
@@ -581,9 +784,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c417",
-                    "hash" : "0x3c3b1a77d473285746c404de13f36afbe9518b6bf879c7b9978cac8843c82e5e",
-                    "mixHash" : "0x2effa598d5b3c01c88621d854d2577658cd3ca71b3eb739e821c3b100c53c66d",
-                    "nonce" : "0x3bd1e4a2988ac809",
+                    "hash" : "0xc1df35be4103e19aef637c42dce8162a3569b63f36d768568a5c865e99e5a9ab",
+                    "mixHash" : "0xb16929079b9a4bde982058c20529df52540af9a5fafaf04ba197c4722d353e0a",
+                    "nonce" : "0x32670aeb386d644d",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
                     "receiptTrie" : "0xf0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73b",
@@ -592,7 +795,7 @@
                     "transactionsTrie" : "0x518c9be3cef31f3bebf740e54400d02ef7a9c4105101f9b33925387ac3c0e053",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15fa0518c9be3cef31f3bebf740e54400d02ef7a9c4105101f9b33925387ac3c0e053a0f0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c4178203e880a02effa598d5b3c01c88621d854d2577658cd3ca71b3eb739e821c3b100c53c66d883bd1e4a2988ac809f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a6000000000000000000000000000000000000001ca026af0d2b4e8c8be9521976c00b05d9731980746bc66d45c9b39b6d03c9abd22ea033e5e8dd8a1846f471ca18c59438ef2c588a7f6754c98e0a565729ed2f1c1d0fc0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15fa0518c9be3cef31f3bebf740e54400d02ef7a9c4105101f9b33925387ac3c0e053a0f0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c4178203e880a0b16929079b9a4bde982058c20529df52540af9a5fafaf04ba197c4722d353e0a8832670aeb386d644df882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a6000000000000000000000000000000000000001ca026af0d2b4e8c8be9521976c00b05d9731980746bc66d45c9b39b6d03c9abd22ea033e5e8dd8a1846f471ca18c59438ef2c588a7f6754c98e0a565729ed2f1c1d0fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a600000000000000000000000000000000000000",
@@ -629,8 +832,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3c3b1a77d473285746c404de13f36afbe9518b6bf879c7b9978cac8843c82e5e",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc1df35be4103e19aef637c42dce8162a3569b63f36d768568a5c865e99e5a9ab",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c417",
@@ -755,10 +958,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d5g0v0_Metropolis" : {
+    "RevertOpcodeReturn_d5g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d5g0v0Filler.json"
         },
         "blocks" : [
@@ -769,19 +972,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xcaf3",
-                    "hash" : "0x87c8afdb5ff676d600998103e20878f6cf69a1e06c11845d834d0c1d2fc545cf",
-                    "mixHash" : "0x59e5e858a2165453509c349d3f52e8bf368c950cf0114056f3711c074d86089a",
-                    "nonce" : "0x57e9ff0518e7a9c9",
+                    "gasUsed" : "0x02c417",
+                    "hash" : "0x9600d27ef3169ccd18a5cfaa100fc8be1e3495e4cf8efbaee177a1a94e3bcfd8",
+                    "mixHash" : "0x5ef5d8ec733167b9661823a9b97c62802fd883966c4c7b1094e1f6f383a5d988",
+                    "nonce" : "0x77fc5c166a2c0254",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0x018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7",
-                    "stateRoot" : "0x3ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8",
+                    "receiptTrie" : "0xf0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73b",
+                    "stateRoot" : "0x341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x518c9be3cef31f3bebf740e54400d02ef7a9c4105101f9b33925387ac3c0e053",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8a0518c9be3cef31f3bebf740e54400d02ef7a9c4105101f9b33925387ac3c0e053a0018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082caf38203e880a059e5e858a2165453509c349d3f52e8bf368c950cf0114056f3711c074d86089a8857e9ff0518e7a9c9f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a6000000000000000000000000000000000000001ca026af0d2b4e8c8be9521976c00b05d9731980746bc66d45c9b39b6d03c9abd22ea033e5e8dd8a1846f471ca18c59438ef2c588a7f6754c98e0a565729ed2f1c1d0fc0",
+                "rlp" : "0xf90280f901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341c087ab8059a364acf32cebec6111c5be47f29d272caa6102963cf672ba15fa0518c9be3cef31f3bebf740e54400d02ef7a9c4105101f9b33925387ac3c0e053a0f0ceac2c40c91dfd16fff8b017924497c4858c4441ff5724b0ebffb232b4b73bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c4178203e880a05ef5d8ec733167b9661823a9b97c62802fd883966c4c7b1094e1f6f383a5d9888877fc5c166a2c0254f882f8808001830c350094a00000000000000000000000000000000000000080a0000000000000000000000000a6000000000000000000000000000000000000001ca026af0d2b4e8c8be9521976c00b05d9731980746bc66d45c9b39b6d03c9abd22ea033e5e8dd8a1846f471ca18c59438ef2c588a7f6754c98e0a565729ed2f1c1d0fc0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a600000000000000000000000000000000000000",
@@ -818,18 +1021,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x87c8afdb5ff676d600998103e20878f6cf69a1e06c11845d834d0c1d2fc545cf",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9600d27ef3169ccd18a5cfaa100fc8be1e3495e4cf8efbaee177a1a94e3bcfd8",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4caf3",
+                "balance" : "0x4563918244f6c417",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -885,7 +1081,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a4450d",
+                "balance" : "0xe8d4a24be9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d5g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d5g1v0.json
index d059956ab..c6939a9f0 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d5g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcodeReturn_d5g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcodeReturn_d5g1v0_EIP150" : {
+    "RevertOpcodeReturn_d5g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d5g1v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x011170",
-                    "hash" : "0x4509d9393ed8aecb200e8be36ba8d2e0189221c0bac7a7df58bab33c51719ea6",
-                    "mixHash" : "0x2f9713596c034f7e054c9231ec480a1d43ece73374531fda87c0babe803e6223",
-                    "nonce" : "0x1b4a2a6f29fe8953",
+                    "gasUsed" : "0xcaf3",
+                    "hash" : "0x47138d04db7308032c6710de79bf3a81890a690972b96ce04a19d61ddb613964",
+                    "mixHash" : "0x16c45d87ca50130800e8db2838d26633e658ab426e396ef8829768a5aafb63b6",
+                    "nonce" : "0xb5c5e069c282c23a",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
-                    "stateRoot" : "0xfcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660f",
+                    "receiptTrie" : "0x018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7",
+                    "stateRoot" : "0x3ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf59b1938393e391754db0172e6212e63f557b85c82c4f0958a9ae2b9af815b8c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0f59b1938393e391754db0172e6212e63f557b85c82c4f0958a9ae2b9af815b8ca00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a02f9713596c034f7e054c9231ec480a1d43ece73374531fda87c0babe803e6223881b4a2a6f29fe8953f881f87f80018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a6000000000000000000000000000000000000001b9f6deed389fc17039f283492459b0da5fd4614f1c829d6c55722fcaa3c1f4afea04064f91ea3b58305ceece70f7938d988a2c93f70b4e5a9269d04a5d6bb4f84f5c0",
+                "rlp" : "0xf9027ef901f7a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8a0f59b1938393e391754db0172e6212e63f557b85c82c4f0958a9ae2b9af815b8ca0018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082caf38203e880a016c45d87ca50130800e8db2838d26633e658ab426e396ef8829768a5aafb63b688b5c5e069c282c23af881f87f80018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a6000000000000000000000000000000000000001b9f6deed389fc17039f283492459b0da5fd4614f1c829d6c55722fcaa3c1f4afea04064f91ea3b58305ceece70f7938d988a2c93f70b4e5a9269d04a5d6bb4f84f5c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a600000000000000000000000000000000000000",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4509d9393ed8aecb200e8be36ba8d2e0189221c0bac7a7df58bab33c51719ea6",
-        "network" : "EIP150",
+        "lastblockhash" : "0x47138d04db7308032c6710de79bf3a81890a690972b96ce04a19d61ddb613964",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51170",
+                "balance" : "0x4563918244f4caf3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -122,7 +129,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3fe90",
+                "balance" : "0xe8d4a4450d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -188,10 +195,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d5g1v0_EIP158" : {
+    "RevertOpcodeReturn_d5g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d5g1v0Filler.json"
         },
         "blocks" : [
@@ -202,19 +209,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x011170",
-                    "hash" : "0xd1b84f406474157c3c8d44d56e689137e61848f65f39add0b3b6d7829a87230e",
-                    "mixHash" : "0x2844b78928c6733fac925ed45cd9f2cf20cf679abc793d91263deca9b53cf1f3",
-                    "nonce" : "0xea384038c0f066dd",
+                    "gasUsed" : "0xcaf3",
+                    "hash" : "0x36f7472c8f504bbde5ec4f8d968ed89cc4f6c022ca079bef4b2be3af0df5fb94",
+                    "mixHash" : "0xc4ac1a6225d7e865b5d1532171a7e334d94efd33ceaa0952af2421ae2edec48f",
+                    "nonce" : "0x6dfd5127f230ccac",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
-                    "stateRoot" : "0xfcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660f",
+                    "receiptTrie" : "0x018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7",
+                    "stateRoot" : "0x3ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf59b1938393e391754db0172e6212e63f557b85c82c4f0958a9ae2b9af815b8c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0f59b1938393e391754db0172e6212e63f557b85c82c4f0958a9ae2b9af815b8ca00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a02844b78928c6733fac925ed45cd9f2cf20cf679abc793d91263deca9b53cf1f388ea384038c0f066ddf881f87f80018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a6000000000000000000000000000000000000001b9f6deed389fc17039f283492459b0da5fd4614f1c829d6c55722fcaa3c1f4afea04064f91ea3b58305ceece70f7938d988a2c93f70b4e5a9269d04a5d6bb4f84f5c0",
+                "rlp" : "0xf9027ef901f7a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8a0f59b1938393e391754db0172e6212e63f557b85c82c4f0958a9ae2b9af815b8ca0018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082caf38203e880a0c4ac1a6225d7e865b5d1532171a7e334d94efd33ceaa0952af2421ae2edec48f886dfd5127f230ccacf881f87f80018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a6000000000000000000000000000000000000001b9f6deed389fc17039f283492459b0da5fd4614f1c829d6c55722fcaa3c1f4afea04064f91ea3b58305ceece70f7938d988a2c93f70b4e5a9269d04a5d6bb4f84f5c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a600000000000000000000000000000000000000",
@@ -251,11 +258,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd1b84f406474157c3c8d44d56e689137e61848f65f39add0b3b6d7829a87230e",
-        "network" : "EIP158",
+        "lastblockhash" : "0x36f7472c8f504bbde5ec4f8d968ed89cc4f6c022ca079bef4b2be3af0df5fb94",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51170",
+                "balance" : "0x4563918244f4caf3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -311,7 +325,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3fe90",
+                "balance" : "0xe8d4a4450d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -377,10 +391,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d5g1v0_Frontier" : {
+    "RevertOpcodeReturn_d5g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d5g1v0Filler.json"
         },
         "blocks" : [
@@ -392,9 +406,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0x0b89d229b6ce47f6729d2ca50f2616190da7243646912c58e211747453d8dd99",
-                    "mixHash" : "0x1fb7901336e552145769f9d66ad35d9ec13d0861ad8f6880fcb70cbb605c3e9c",
-                    "nonce" : "0x5fb2c827796b932e",
+                    "hash" : "0xd509c051646ac40663eff722fcf763782f6dcb0e7b29b25b2064fa9babf43d9f",
+                    "mixHash" : "0x2c9e3e49a39a29ff085b3e22242c6e2fbdac0f61ed494a2dbee5e5f19b0e081f",
+                    "nonce" : "0x8c909e3606b0c279",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
                     "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
@@ -403,7 +417,7 @@
                     "transactionsTrie" : "0xf59b1938393e391754db0172e6212e63f557b85c82c4f0958a9ae2b9af815b8c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0f59b1938393e391754db0172e6212e63f557b85c82c4f0958a9ae2b9af815b8ca00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a01fb7901336e552145769f9d66ad35d9ec13d0861ad8f6880fcb70cbb605c3e9c885fb2c827796b932ef881f87f80018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a6000000000000000000000000000000000000001b9f6deed389fc17039f283492459b0da5fd4614f1c829d6c55722fcaa3c1f4afea04064f91ea3b58305ceece70f7938d988a2c93f70b4e5a9269d04a5d6bb4f84f5c0",
+                "rlp" : "0xf9027ff901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0f59b1938393e391754db0172e6212e63f557b85c82c4f0958a9ae2b9af815b8ca00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a02c9e3e49a39a29ff085b3e22242c6e2fbdac0f61ed494a2dbee5e5f19b0e081f888c909e3606b0c279f881f87f80018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a6000000000000000000000000000000000000001b9f6deed389fc17039f283492459b0da5fd4614f1c829d6c55722fcaa3c1f4afea04064f91ea3b58305ceece70f7938d988a2c93f70b4e5a9269d04a5d6bb4f84f5c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a600000000000000000000000000000000000000",
@@ -440,8 +454,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0b89d229b6ce47f6729d2ca50f2616190da7243646912c58e211747453d8dd99",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd509c051646ac40663eff722fcf763782f6dcb0e7b29b25b2064fa9babf43d9f",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51170",
@@ -566,10 +580,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d5g1v0_Homestead" : {
+    "RevertOpcodeReturn_d5g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d5g1v0Filler.json"
         },
         "blocks" : [
@@ -581,9 +595,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0xd38e80841dfb207f4ffebc1706e2bd10e26e124cc934224129356d6f18164d2a",
-                    "mixHash" : "0x5e70100d3af79b0beab885fca2f9df2a58d2a44c2f83ad483f22bc4d50eeddf5",
-                    "nonce" : "0x84dbf572bf2b3b20",
+                    "hash" : "0x688d27ba706c694319718d99f1921ce061abdc837fe019160572c20eccfe8a33",
+                    "mixHash" : "0xa64bc055583a0a299319c9bf3c7df5f29f6c763d7c70ab5d3869553c0e3d871c",
+                    "nonce" : "0x0e288026efd1c693",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
                     "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
@@ -592,7 +606,7 @@
                     "transactionsTrie" : "0xf59b1938393e391754db0172e6212e63f557b85c82c4f0958a9ae2b9af815b8c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0f59b1938393e391754db0172e6212e63f557b85c82c4f0958a9ae2b9af815b8ca00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a05e70100d3af79b0beab885fca2f9df2a58d2a44c2f83ad483f22bc4d50eeddf58884dbf572bf2b3b20f881f87f80018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a6000000000000000000000000000000000000001b9f6deed389fc17039f283492459b0da5fd4614f1c829d6c55722fcaa3c1f4afea04064f91ea3b58305ceece70f7938d988a2c93f70b4e5a9269d04a5d6bb4f84f5c0",
+                "rlp" : "0xf9027ff901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0f59b1938393e391754db0172e6212e63f557b85c82c4f0958a9ae2b9af815b8ca00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0a64bc055583a0a299319c9bf3c7df5f29f6c763d7c70ab5d3869553c0e3d871c880e288026efd1c693f881f87f80018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a6000000000000000000000000000000000000001b9f6deed389fc17039f283492459b0da5fd4614f1c829d6c55722fcaa3c1f4afea04064f91ea3b58305ceece70f7938d988a2c93f70b4e5a9269d04a5d6bb4f84f5c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a600000000000000000000000000000000000000",
@@ -629,8 +643,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd38e80841dfb207f4ffebc1706e2bd10e26e124cc934224129356d6f18164d2a",
-        "network" : "Homestead",
+        "lastblockhash" : "0x688d27ba706c694319718d99f1921ce061abdc837fe019160572c20eccfe8a33",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f51170",
@@ -755,10 +769,10 @@
             }
         }
     },
-    "RevertOpcodeReturn_d5g1v0_Metropolis" : {
+    "RevertOpcodeReturn_d5g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d5g1v0Filler.json"
         },
         "blocks" : [
@@ -769,19 +783,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xcaf3",
-                    "hash" : "0x851d7f444013000969b8e5f7791a9f35be16d84fb44878b4e2ff53f579316740",
-                    "mixHash" : "0xac523d20366c1554ea594efcd7b5a1fa6a203c1cd0b1c6c92dd76b21e1afd768",
-                    "nonce" : "0xb7ea6bc123f231e8",
+                    "gasUsed" : "0x011170",
+                    "hash" : "0xddc9076f12061633e11f80b4f276bf3f0e5e2724a05a8d0d267065b3b9730d67",
+                    "mixHash" : "0x2609778a0512e79068de125e9592e4df786a7c2f113c4898697284898d1acd26",
+                    "nonce" : "0xf4b169c040c84e4d",
                     "number" : "0x01",
                     "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
-                    "receiptTrie" : "0x018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7",
-                    "stateRoot" : "0x3ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8",
+                    "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
+                    "stateRoot" : "0xfcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf59b1938393e391754db0172e6212e63f557b85c82c4f0958a9ae2b9af815b8c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ef901f7a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ad4c91231bc7f46b61b6573338efb9f8746a60c577562683cdc2b83382788a8a0f59b1938393e391754db0172e6212e63f557b85c82c4f0958a9ae2b9af815b8ca0018316f1b4396aeb6b4a173d153bf2a4221a7ce3bf937bd17aef7165001ddaf7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082caf38203e880a0ac523d20366c1554ea594efcd7b5a1fa6a203c1cd0b1c6c92dd76b21e1afd76888b7ea6bc123f231e8f881f87f80018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a6000000000000000000000000000000000000001b9f6deed389fc17039f283492459b0da5fd4614f1c829d6c55722fcaa3c1f4afea04064f91ea3b58305ceece70f7938d988a2c93f70b4e5a9269d04a5d6bb4f84f5c0",
+                "rlp" : "0xf9027ff901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0f59b1938393e391754db0172e6212e63f557b85c82c4f0958a9ae2b9af815b8ca00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a02609778a0512e79068de125e9592e4df786a7c2f113c4898697284898d1acd2688f4b169c040c84e4df881f87f80018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a6000000000000000000000000000000000000001b9f6deed389fc17039f283492459b0da5fd4614f1c829d6c55722fcaa3c1f4afea04064f91ea3b58305ceece70f7938d988a2c93f70b4e5a9269d04a5d6bb4f84f5c0",
                 "transactions" : [
                     {
                         "data" : "0x000000000000000000000000a600000000000000000000000000000000000000",
@@ -818,18 +832,200 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x851d7f444013000969b8e5f7791a9f35be16d84fb44878b4e2ff53f579316740",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xddc9076f12061633e11f80b4f276bf3f0e5e2724a05a8d0d267065b3b9730d67",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f51170",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa500000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa600000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3fe90",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60206000600060006000600035620249f0f1600155600051600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa100000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260206000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa200000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006000fd",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa300000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526e0fffffffffffffffffffffffffffff6000fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa400000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d6573736167656000526000610100fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa500000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006001fd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa600000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6c726576657274656420646174616000556d726576657274206d65737361676560005260006e0ffffffffffffffffffffffffffffffd",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcodeReturn_d5g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcodeReturn_d5g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x011170",
+                    "hash" : "0x227900b3810fb2e14d5162b55141054c74073804a2007a6ba1fa86f02dc1a641",
+                    "mixHash" : "0xce9279a4767adf4a42005ea0b9e4dfebd2fde9a704f8aa40ff43c6459ffd1370",
+                    "nonce" : "0x43109d5961e67574",
+                    "number" : "0x01",
+                    "parentHash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
+                    "receiptTrie" : "0x0de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1f",
+                    "stateRoot" : "0xfcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf59b1938393e391754db0172e6212e63f557b85c82c4f0958a9ae2b9af815b8c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9027ff901f8a0cfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fcf50580c069eee894106ee4c7ec0ae65ffc937deffa61d2fb5d55c69e7a660fa0f59b1938393e391754db0172e6212e63f557b85c82c4f0958a9ae2b9af815b8ca00de8e06764d628eb9df25b92ecf5fc14b1c9b5633503d4bf771bbb6aee665e1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0ce9279a4767adf4a42005ea0b9e4dfebd2fde9a704f8aa40ff43c6459ffd13708843109d5961e67574f881f87f80018301117094a00000000000000000000000000000000000000080a0000000000000000000000000a6000000000000000000000000000000000000001b9f6deed389fc17039f283492459b0da5fd4614f1c829d6c55722fcaa3c1f4afea04064f91ea3b58305ceece70f7938d988a2c93f70b4e5a9269d04a5d6bb4f84f5c0",
+                "transactions" : [
+                    {
+                        "data" : "0x000000000000000000000000a600000000000000000000000000000000000000",
+                        "gasLimit" : "0x011170",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6deed389fc17039f283492459b0da5fd4614f1c829d6c55722fcaa3c1f4afe",
+                        "s" : "0x4064f91ea3b58305ceece70f7938d988a2c93f70b4e5a9269d04a5d6bb4f84f5",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xcfd57f71685c8344273e97531caa73fa1d11eab09c95bde948cdb71250e3047a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fef322a71142192bd16de1044b5416da09ef0bbb74325d8a454373a10eeefd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x227900b3810fb2e14d5162b55141054c74073804a2007a6ba1fa86f02dc1a641",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4caf3",
+                "balance" : "0x4563918244f51170",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -885,7 +1081,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a4450d",
+                "balance" : "0xe8d4a3fe90",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcode_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcode_d0g0v0.json
index 1d85020c7..b8bbff2f6 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcode_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcode_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcode_d0g0v0_EIP150" : {
+    "RevertOpcode_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/stRevertTest/RevertOpcode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0c3500",
-                    "hash" : "0x05acd021fc35df462afe0dc4b38b4e41420adc4a33d6d78a779d61259487a080",
-                    "mixHash" : "0x16881b6a52fcd391ea595952e5e568689d0868b53b8ec19600243a2bb9476e1d",
-                    "nonce" : "0x773c722f0452a3e6",
+                    "gasUsed" : "0xa037",
+                    "hash" : "0x8a3e07796e5b7c05e35c687b0aef5320ca5eba404c7137ddc63921be811a2ad0",
+                    "mixHash" : "0x9aa9d1471a50e39005cfce01cc84d6b2ec899f8a6b0cd4f3716fba95ab407095",
+                    "nonce" : "0xa901439b29199630",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
-                    "receiptTrie" : "0x7dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51",
-                    "stateRoot" : "0xf102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7",
+                    "receiptTrie" : "0x5c30cc631818cdb3019c31b84be5cef56e387b8388140444377adee1f6fbf8c4",
+                    "stateRoot" : "0xd6ec7f65ad06f6856df9e74079f4f8299b0ee1ba5299e21dda0acce648517191",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7a04771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758a07dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830c35008203e880a016881b6a52fcd391ea595952e5e568689d0868b53b8ec19600243a2bb9476e1d88773c722f0452a3e6f862f8608001830c350094a00000000000000000000000000000000000000080801ba06a2f423bb3fe430329fbab1a3ee2fcab978a511856631dda961eb56896ade562a032976be7407a2f332c2449a28234103ebb8312909467b561fc271f027e1ed914c0",
+                "rlp" : "0xf9025ff901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d6ec7f65ad06f6856df9e74079f4f8299b0ee1ba5299e21dda0acce648517191a04771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758a05c30cc631818cdb3019c31b84be5cef56e387b8388140444377adee1f6fbf8c4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a0378203e880a09aa9d1471a50e39005cfce01cc84d6b2ec899f8a6b0cd4f3716fba95ab40709588a901439b29199630f862f8608001830c350094a00000000000000000000000000000000000000080801ba06a2f423bb3fe430329fbab1a3ee2fcab978a511856631dda961eb56896ade562a032976be7407a2f332c2449a28234103ebb8312909467b561fc271f027e1ed914c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x05acd021fc35df462afe0dc4b38b4e41420adc4a33d6d78a779d61259487a080",
-        "network" : "EIP150",
+        "lastblockhash" : "0x8a3e07796e5b7c05e35c687b0aef5320ca5eba404c7137ddc63921be811a2ad0",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918245003500",
+                "balance" : "0x4563918244f4a037",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -80,7 +87,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d498db00",
+                "balance" : "0xe8d4a46fc9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -104,10 +111,10 @@
             }
         }
     },
-    "RevertOpcode_d0g0v0_EIP158" : {
+    "RevertOpcode_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/stRevertTest/RevertOpcode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -118,19 +125,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0c3500",
-                    "hash" : "0x74c311f1e54ab529d929aaf7e677471a77565f43ea9d03aa5e894513d83cdaed",
-                    "mixHash" : "0x0b632b8a35442624e8dc8d3a191c93779dcc501a7e9cb5e5834552dc15f148cb",
-                    "nonce" : "0xbc2fdf052ea2be77",
+                    "gasUsed" : "0xa037",
+                    "hash" : "0x5fe5d9b4aa858df3458de1705ecfe77707b370ea68b47d2155162afe5840cb47",
+                    "mixHash" : "0x18fff4867c2ce59c201dc65ca0328a0e5f27f0d67f1cdab92d42d52bc94959c6",
+                    "nonce" : "0xd0c3480d5450bcb1",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
-                    "receiptTrie" : "0x7dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51",
-                    "stateRoot" : "0xf102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7",
+                    "receiptTrie" : "0x5c30cc631818cdb3019c31b84be5cef56e387b8388140444377adee1f6fbf8c4",
+                    "stateRoot" : "0xd6ec7f65ad06f6856df9e74079f4f8299b0ee1ba5299e21dda0acce648517191",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7a04771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758a07dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830c35008203e880a00b632b8a35442624e8dc8d3a191c93779dcc501a7e9cb5e5834552dc15f148cb88bc2fdf052ea2be77f862f8608001830c350094a00000000000000000000000000000000000000080801ba06a2f423bb3fe430329fbab1a3ee2fcab978a511856631dda961eb56896ade562a032976be7407a2f332c2449a28234103ebb8312909467b561fc271f027e1ed914c0",
+                "rlp" : "0xf9025ff901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d6ec7f65ad06f6856df9e74079f4f8299b0ee1ba5299e21dda0acce648517191a04771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758a05c30cc631818cdb3019c31b84be5cef56e387b8388140444377adee1f6fbf8c4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a0378203e880a018fff4867c2ce59c201dc65ca0328a0e5f27f0d67f1cdab92d42d52bc94959c688d0c3480d5450bcb1f862f8608001830c350094a00000000000000000000000000000000000000080801ba06a2f423bb3fe430329fbab1a3ee2fcab978a511856631dda961eb56896ade562a032976be7407a2f332c2449a28234103ebb8312909467b561fc271f027e1ed914c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,11 +174,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x74c311f1e54ab529d929aaf7e677471a77565f43ea9d03aa5e894513d83cdaed",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5fe5d9b4aa858df3458de1705ecfe77707b370ea68b47d2155162afe5840cb47",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918245003500",
+                "balance" : "0x4563918244f4a037",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -185,7 +199,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d498db00",
+                "balance" : "0xe8d4a46fc9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -209,10 +223,10 @@
             }
         }
     },
-    "RevertOpcode_d0g0v0_Frontier" : {
+    "RevertOpcode_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/stRevertTest/RevertOpcode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0c3500",
-                    "hash" : "0xcc5d9ab50a1253638007a9d47558e9670080994c67e9af0e0bc645e60e987097",
-                    "mixHash" : "0xeee3b6a39b9467ba3272a09669bcad44864a1fbb46d87f3c4d2335dc0985ee8a",
-                    "nonce" : "0x291f03305df32f20",
+                    "hash" : "0x21c3bbdc826866cefa61d84f644bbfb01dcbf3780c658b4d17c2b3ebd7097a40",
+                    "mixHash" : "0x1c8fc490d7ef14ae7808729a5f7fd8f9e29c5c17a056eed7af20e4ac37cc8d9c",
+                    "nonce" : "0x6f6657958a6e1204",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
                     "receiptTrie" : "0x7dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x4771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7a04771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758a07dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830c35008203e880a0eee3b6a39b9467ba3272a09669bcad44864a1fbb46d87f3c4d2335dc0985ee8a88291f03305df32f20f862f8608001830c350094a00000000000000000000000000000000000000080801ba06a2f423bb3fe430329fbab1a3ee2fcab978a511856631dda961eb56896ade562a032976be7407a2f332c2449a28234103ebb8312909467b561fc271f027e1ed914c0",
+                "rlp" : "0xf90260f901f8a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7a04771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758a07dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830c35008203e880a01c8fc490d7ef14ae7808729a5f7fd8f9e29c5c17a056eed7af20e4ac37cc8d9c886f6657958a6e1204f862f8608001830c350094a00000000000000000000000000000000000000080801ba06a2f423bb3fe430329fbab1a3ee2fcab978a511856631dda961eb56896ade562a032976be7407a2f332c2449a28234103ebb8312909467b561fc271f027e1ed914c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcc5d9ab50a1253638007a9d47558e9670080994c67e9af0e0bc645e60e987097",
-        "network" : "Frontier",
+        "lastblockhash" : "0x21c3bbdc826866cefa61d84f644bbfb01dcbf3780c658b4d17c2b3ebd7097a40",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918245003500",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "RevertOpcode_d0g0v0_Homestead" : {
+    "RevertOpcode_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/stRevertTest/RevertOpcode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0c3500",
-                    "hash" : "0x72e395a645a9df966713a3bc2e76f25b5a2a7cb74196a78f52086a33f52adb19",
-                    "mixHash" : "0x3a555035ef91889539cf8a62ced499efa2a5f6d756d95b32167e7fb52ba10413",
-                    "nonce" : "0x2122c6a7f8e2c470",
+                    "hash" : "0x8d9c4378518adfadce2af2174a0b97e25e5004a0fddc4ffb6a2b0d4131396a77",
+                    "mixHash" : "0x078864349a45a7a5dd8b682cf52d13978ff7e3c88fc5026166561376527313fd",
+                    "nonce" : "0x90f59797f2c07ca7",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
                     "receiptTrie" : "0x7dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x4771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7a04771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758a07dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830c35008203e880a03a555035ef91889539cf8a62ced499efa2a5f6d756d95b32167e7fb52ba10413882122c6a7f8e2c470f862f8608001830c350094a00000000000000000000000000000000000000080801ba06a2f423bb3fe430329fbab1a3ee2fcab978a511856631dda961eb56896ade562a032976be7407a2f332c2449a28234103ebb8312909467b561fc271f027e1ed914c0",
+                "rlp" : "0xf90260f901f8a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7a04771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758a07dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830c35008203e880a0078864349a45a7a5dd8b682cf52d13978ff7e3c88fc5026166561376527313fd8890f59797f2c07ca7f862f8608001830c350094a00000000000000000000000000000000000000080801ba06a2f423bb3fe430329fbab1a3ee2fcab978a511856631dda961eb56896ade562a032976be7407a2f332c2449a28234103ebb8312909467b561fc271f027e1ed914c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x72e395a645a9df966713a3bc2e76f25b5a2a7cb74196a78f52086a33f52adb19",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8d9c4378518adfadce2af2174a0b97e25e5004a0fddc4ffb6a2b0d4131396a77",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918245003500",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "RevertOpcode_d0g0v0_Metropolis" : {
+    "RevertOpcode_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/stRevertTest/RevertOpcode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -433,19 +447,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xa037",
-                    "hash" : "0x5edbf2a26b3815c6563eee203c1a0989faca3670b265c750251295ee38ace4e2",
-                    "mixHash" : "0x09552e1c4f1d7a92617ba79575befc1a9c158125e3d767637266f6153b950064",
-                    "nonce" : "0x53de84c2920ac180",
+                    "gasUsed" : "0x0c3500",
+                    "hash" : "0x6d105c9697194879464e09fe7f024e564d364fa082b85ace3080d22e39bc06a1",
+                    "mixHash" : "0xd2886fa17e26e319b747eaf6929d5f064feab1c3de7602caca8e203bc6a0458d",
+                    "nonce" : "0x0b8dabfff3efc9f2",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
-                    "receiptTrie" : "0x5c30cc631818cdb3019c31b84be5cef56e387b8388140444377adee1f6fbf8c4",
-                    "stateRoot" : "0xd6ec7f65ad06f6856df9e74079f4f8299b0ee1ba5299e21dda0acce648517191",
+                    "receiptTrie" : "0x7dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51",
+                    "stateRoot" : "0xf102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d6ec7f65ad06f6856df9e74079f4f8299b0ee1ba5299e21dda0acce648517191a04771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758a05c30cc631818cdb3019c31b84be5cef56e387b8388140444377adee1f6fbf8c4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a0378203e880a009552e1c4f1d7a92617ba79575befc1a9c158125e3d767637266f6153b9500648853de84c2920ac180f862f8608001830c350094a00000000000000000000000000000000000000080801ba06a2f423bb3fe430329fbab1a3ee2fcab978a511856631dda961eb56896ade562a032976be7407a2f332c2449a28234103ebb8312909467b561fc271f027e1ed914c0",
+                "rlp" : "0xf90260f901f8a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7a04771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758a07dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830c35008203e880a0d2886fa17e26e319b747eaf6929d5f064feab1c3de7602caca8e203bc6a0458d880b8dabfff3efc9f2f862f8608001830c350094a00000000000000000000000000000000000000080801ba06a2f423bb3fe430329fbab1a3ee2fcab978a511856631dda961eb56896ade562a032976be7407a2f332c2449a28234103ebb8312909467b561fc271f027e1ed914c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,18 +496,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5edbf2a26b3815c6563eee203c1a0989faca3670b265c750251295ee38ace4e2",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6d105c9697194879464e09fe7f024e564d364fa082b85ace3080d22e39bc06a1",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918245003500",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x600160005560016000fd6011600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d498db00",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600160005560016000fd6011600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcode_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcode_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0c3500",
+                    "hash" : "0x6f1e7d1be0fb92634077970eeddbbe869f7717f91cfe4fb316be16d0ae498f60",
+                    "mixHash" : "0xe1fcd9595d6b6890096c30bb4872dfac7a93fa8086d31232efa7b9271b807a4d",
+                    "nonce" : "0x44518577871a9a49",
+                    "number" : "0x01",
+                    "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
+                    "receiptTrie" : "0x7dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51",
+                    "stateRoot" : "0xf102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7a04771c392324296274c26974af88d8f86e633a69800f8136c89273db20f04b758a07dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830c35008203e880a0e1fcd9595d6b6890096c30bb4872dfac7a93fa8086d31232efa7b9271b807a4d8844518577871a9a49f862f8608001830c350094a00000000000000000000000000000000000000080801ba06a2f423bb3fe430329fbab1a3ee2fcab978a511856631dda961eb56896ade562a032976be7407a2f332c2449a28234103ebb8312909467b561fc271f027e1ed914c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0c3500",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6a2f423bb3fe430329fbab1a3ee2fcab978a511856631dda961eb56896ade562",
+                        "s" : "0x32976be7407a2f332c2449a28234103ebb8312909467b561fc271f027e1ed914",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6f1e7d1be0fb92634077970eeddbbe869f7717f91cfe4fb316be16d0ae498f60",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a037",
+                "balance" : "0x4563918245003500",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,7 +619,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a46fc9",
+                "balance" : "0xe8d498db00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcode_d0g0v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcode_d0g0v1.json
index 4dd9c0ff2..dc052039a 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcode_d0g0v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcode_d0g0v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcode_d0g0v1_EIP150" : {
+    "RevertOpcode_d0g0v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcode_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0c3500",
-                    "hash" : "0x4c1c0e2c7708cafe676cbde654e07aaa20693dc4a3050e952b81ea8e8f857fbb",
-                    "mixHash" : "0x724f9b78c8ab866902003284e3524e93a56592a9363fd8a64ea074517506b20f",
-                    "nonce" : "0x6d01316ccfb565a5",
+                    "gasUsed" : "0xa037",
+                    "hash" : "0x97436cd4bad232b09ec6105deb24091abe10507178c6d06820d00741ec4dd082",
+                    "mixHash" : "0x0d1011325d5e5e238b4fafaa878c58b1b555c9fcc1b162a117b140fbc85fd321",
+                    "nonce" : "0x7a7597578f31c3aa",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
-                    "receiptTrie" : "0x7dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51",
-                    "stateRoot" : "0xf102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7",
+                    "receiptTrie" : "0x5c30cc631818cdb3019c31b84be5cef56e387b8388140444377adee1f6fbf8c4",
+                    "stateRoot" : "0xd6ec7f65ad06f6856df9e74079f4f8299b0ee1ba5299e21dda0acce648517191",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf30045b47ea8c48691ad7eabc8903d3cc479e3b6bef031a2894cf71e0232b259",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7a0f30045b47ea8c48691ad7eabc8903d3cc479e3b6bef031a2894cf71e0232b259a07dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830c35008203e880a0724f9b78c8ab866902003284e3524e93a56592a9363fd8a64ea074517506b20f886d01316ccfb565a5f862f8608001830c350094a0000000000000000000000000000000000000000a801ba0f4ac47ee32f13b3f54d298369a82d33ef1c80c58d04525a85e4f8fcfa57729f4a03e9fdc44de07ca288479815062ab19ff708d0180a2d80d6e77aa6562de839860c0",
+                "rlp" : "0xf9025ff901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d6ec7f65ad06f6856df9e74079f4f8299b0ee1ba5299e21dda0acce648517191a0f30045b47ea8c48691ad7eabc8903d3cc479e3b6bef031a2894cf71e0232b259a05c30cc631818cdb3019c31b84be5cef56e387b8388140444377adee1f6fbf8c4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a0378203e880a00d1011325d5e5e238b4fafaa878c58b1b555c9fcc1b162a117b140fbc85fd321887a7597578f31c3aaf862f8608001830c350094a0000000000000000000000000000000000000000a801ba0f4ac47ee32f13b3f54d298369a82d33ef1c80c58d04525a85e4f8fcfa57729f4a03e9fdc44de07ca288479815062ab19ff708d0180a2d80d6e77aa6562de839860c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,11 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4c1c0e2c7708cafe676cbde654e07aaa20693dc4a3050e952b81ea8e8f857fbb",
-        "network" : "EIP150",
+        "lastblockhash" : "0x97436cd4bad232b09ec6105deb24091abe10507178c6d06820d00741ec4dd082",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918245003500",
+                "balance" : "0x4563918244f4a037",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -80,7 +87,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d498db00",
+                "balance" : "0xe8d4a46fc9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -104,10 +111,10 @@
             }
         }
     },
-    "RevertOpcode_d0g0v1_EIP158" : {
+    "RevertOpcode_d0g0v1_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcode_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -118,19 +125,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0c3500",
-                    "hash" : "0x2fd6f1164451f562715676dad700104c180b2e572a7e39a12221a71f3bf79042",
-                    "mixHash" : "0x96caf652299e3cbb127cf43670a413b70872313b9c5248741d4c30e9a889bd42",
-                    "nonce" : "0xcfefe6f61b4921cf",
+                    "gasUsed" : "0xa037",
+                    "hash" : "0x29cac5bd630ee349c72bfebe96aa33c96dcc05f19730aaeb0248e8144f230d2a",
+                    "mixHash" : "0x43f2595b7d21019a4df05951e5d256546d7f5a859a864322b0bd87fc61de2ce4",
+                    "nonce" : "0xbcb8c945235b9c95",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
-                    "receiptTrie" : "0x7dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51",
-                    "stateRoot" : "0xf102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7",
+                    "receiptTrie" : "0x5c30cc631818cdb3019c31b84be5cef56e387b8388140444377adee1f6fbf8c4",
+                    "stateRoot" : "0xd6ec7f65ad06f6856df9e74079f4f8299b0ee1ba5299e21dda0acce648517191",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf30045b47ea8c48691ad7eabc8903d3cc479e3b6bef031a2894cf71e0232b259",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7a0f30045b47ea8c48691ad7eabc8903d3cc479e3b6bef031a2894cf71e0232b259a07dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830c35008203e880a096caf652299e3cbb127cf43670a413b70872313b9c5248741d4c30e9a889bd4288cfefe6f61b4921cff862f8608001830c350094a0000000000000000000000000000000000000000a801ba0f4ac47ee32f13b3f54d298369a82d33ef1c80c58d04525a85e4f8fcfa57729f4a03e9fdc44de07ca288479815062ab19ff708d0180a2d80d6e77aa6562de839860c0",
+                "rlp" : "0xf9025ff901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d6ec7f65ad06f6856df9e74079f4f8299b0ee1ba5299e21dda0acce648517191a0f30045b47ea8c48691ad7eabc8903d3cc479e3b6bef031a2894cf71e0232b259a05c30cc631818cdb3019c31b84be5cef56e387b8388140444377adee1f6fbf8c4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a0378203e880a043f2595b7d21019a4df05951e5d256546d7f5a859a864322b0bd87fc61de2ce488bcb8c945235b9c95f862f8608001830c350094a0000000000000000000000000000000000000000a801ba0f4ac47ee32f13b3f54d298369a82d33ef1c80c58d04525a85e4f8fcfa57729f4a03e9fdc44de07ca288479815062ab19ff708d0180a2d80d6e77aa6562de839860c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,11 +174,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2fd6f1164451f562715676dad700104c180b2e572a7e39a12221a71f3bf79042",
-        "network" : "EIP158",
+        "lastblockhash" : "0x29cac5bd630ee349c72bfebe96aa33c96dcc05f19730aaeb0248e8144f230d2a",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918245003500",
+                "balance" : "0x4563918244f4a037",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -185,7 +199,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d498db00",
+                "balance" : "0xe8d4a46fc9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -209,10 +223,10 @@
             }
         }
     },
-    "RevertOpcode_d0g0v1_Frontier" : {
+    "RevertOpcode_d0g0v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcode_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0c3500",
-                    "hash" : "0xa933643341096b4c80354087d8b380264ba1cb536319febf1fe54d2852ef291d",
-                    "mixHash" : "0xc00df957a4670547cff98a75c2afe33b51c51a940a90b5f80e71c341c5fc4017",
-                    "nonce" : "0xdf4729ef539c4bad",
+                    "hash" : "0xe624b39dd1c67cd378f30e7b178a93be7a704e056c6776aba6349b298b398ddb",
+                    "mixHash" : "0x0bef10508345a687bb76b501cc58a80f726fe63a02eea6b9d3032036699a6725",
+                    "nonce" : "0xaa371326fff0394e",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
                     "receiptTrie" : "0x7dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0xf30045b47ea8c48691ad7eabc8903d3cc479e3b6bef031a2894cf71e0232b259",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7a0f30045b47ea8c48691ad7eabc8903d3cc479e3b6bef031a2894cf71e0232b259a07dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830c35008203e880a0c00df957a4670547cff98a75c2afe33b51c51a940a90b5f80e71c341c5fc401788df4729ef539c4badf862f8608001830c350094a0000000000000000000000000000000000000000a801ba0f4ac47ee32f13b3f54d298369a82d33ef1c80c58d04525a85e4f8fcfa57729f4a03e9fdc44de07ca288479815062ab19ff708d0180a2d80d6e77aa6562de839860c0",
+                "rlp" : "0xf90260f901f8a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7a0f30045b47ea8c48691ad7eabc8903d3cc479e3b6bef031a2894cf71e0232b259a07dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830c35008203e880a00bef10508345a687bb76b501cc58a80f726fe63a02eea6b9d3032036699a672588aa371326fff0394ef862f8608001830c350094a0000000000000000000000000000000000000000a801ba0f4ac47ee32f13b3f54d298369a82d33ef1c80c58d04525a85e4f8fcfa57729f4a03e9fdc44de07ca288479815062ab19ff708d0180a2d80d6e77aa6562de839860c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa933643341096b4c80354087d8b380264ba1cb536319febf1fe54d2852ef291d",
-        "network" : "Frontier",
+        "lastblockhash" : "0xe624b39dd1c67cd378f30e7b178a93be7a704e056c6776aba6349b298b398ddb",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918245003500",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "RevertOpcode_d0g0v1_Homestead" : {
+    "RevertOpcode_d0g0v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcode_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0c3500",
-                    "hash" : "0x47c75dcb6bef8a233f99ac011208d4eb5cbd745db4f1409986bff262677ffc84",
-                    "mixHash" : "0x5870ae7cd09be6c4a84fffd52b71e26fdeb985a1edfaabb18a09149af7be96ca",
-                    "nonce" : "0xa6dac155fda3f78d",
+                    "hash" : "0x2290053c534e35beb0e9f6fb48bdab37206398fd9eaf1901b8d1e06bc77e5271",
+                    "mixHash" : "0x8d903512b13d9e4dddd517a226a4fcd966c987cd18e8a4a48fb9a38c962f8390",
+                    "nonce" : "0xf9e2fbe2ebbbeaa1",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
                     "receiptTrie" : "0x7dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0xf30045b47ea8c48691ad7eabc8903d3cc479e3b6bef031a2894cf71e0232b259",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7a0f30045b47ea8c48691ad7eabc8903d3cc479e3b6bef031a2894cf71e0232b259a07dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830c35008203e880a05870ae7cd09be6c4a84fffd52b71e26fdeb985a1edfaabb18a09149af7be96ca88a6dac155fda3f78df862f8608001830c350094a0000000000000000000000000000000000000000a801ba0f4ac47ee32f13b3f54d298369a82d33ef1c80c58d04525a85e4f8fcfa57729f4a03e9fdc44de07ca288479815062ab19ff708d0180a2d80d6e77aa6562de839860c0",
+                "rlp" : "0xf90260f901f8a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7a0f30045b47ea8c48691ad7eabc8903d3cc479e3b6bef031a2894cf71e0232b259a07dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830c35008203e880a08d903512b13d9e4dddd517a226a4fcd966c987cd18e8a4a48fb9a38c962f839088f9e2fbe2ebbbeaa1f862f8608001830c350094a0000000000000000000000000000000000000000a801ba0f4ac47ee32f13b3f54d298369a82d33ef1c80c58d04525a85e4f8fcfa57729f4a03e9fdc44de07ca288479815062ab19ff708d0180a2d80d6e77aa6562de839860c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x47c75dcb6bef8a233f99ac011208d4eb5cbd745db4f1409986bff262677ffc84",
-        "network" : "Homestead",
+        "lastblockhash" : "0x2290053c534e35beb0e9f6fb48bdab37206398fd9eaf1901b8d1e06bc77e5271",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918245003500",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "RevertOpcode_d0g0v1_Metropolis" : {
+    "RevertOpcode_d0g0v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcode_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -433,19 +447,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xa037",
-                    "hash" : "0xb6109f9d0b7903247c8e4370555abf1cde523b07d1451b14da6ef20a3cb73eab",
-                    "mixHash" : "0xa2b3d50a21e85e5479fb1b123cec9a265763918ff6a599535f52612c5994d1ee",
-                    "nonce" : "0x9b19ccd5c49dd628",
+                    "gasUsed" : "0x0c3500",
+                    "hash" : "0xf4464112c6f276212cacf48d93832cc9a2d3ea28946d770dc1bff1956861610b",
+                    "mixHash" : "0x1970da9898d08dad6d00c2d73aec8f81c00936568286b057a8ad9ebb46c5981a",
+                    "nonce" : "0x1dc36a965cd609fa",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
-                    "receiptTrie" : "0x5c30cc631818cdb3019c31b84be5cef56e387b8388140444377adee1f6fbf8c4",
-                    "stateRoot" : "0xd6ec7f65ad06f6856df9e74079f4f8299b0ee1ba5299e21dda0acce648517191",
+                    "receiptTrie" : "0x7dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51",
+                    "stateRoot" : "0xf102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf30045b47ea8c48691ad7eabc8903d3cc479e3b6bef031a2894cf71e0232b259",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d6ec7f65ad06f6856df9e74079f4f8299b0ee1ba5299e21dda0acce648517191a0f30045b47ea8c48691ad7eabc8903d3cc479e3b6bef031a2894cf71e0232b259a05c30cc631818cdb3019c31b84be5cef56e387b8388140444377adee1f6fbf8c4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a0378203e880a0a2b3d50a21e85e5479fb1b123cec9a265763918ff6a599535f52612c5994d1ee889b19ccd5c49dd628f862f8608001830c350094a0000000000000000000000000000000000000000a801ba0f4ac47ee32f13b3f54d298369a82d33ef1c80c58d04525a85e4f8fcfa57729f4a03e9fdc44de07ca288479815062ab19ff708d0180a2d80d6e77aa6562de839860c0",
+                "rlp" : "0xf90260f901f8a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7a0f30045b47ea8c48691ad7eabc8903d3cc479e3b6bef031a2894cf71e0232b259a07dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830c35008203e880a01970da9898d08dad6d00c2d73aec8f81c00936568286b057a8ad9ebb46c5981a881dc36a965cd609faf862f8608001830c350094a0000000000000000000000000000000000000000a801ba0f4ac47ee32f13b3f54d298369a82d33ef1c80c58d04525a85e4f8fcfa57729f4a03e9fdc44de07ca288479815062ab19ff708d0180a2d80d6e77aa6562de839860c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,18 +496,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb6109f9d0b7903247c8e4370555abf1cde523b07d1451b14da6ef20a3cb73eab",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xf4464112c6f276212cacf48d93832cc9a2d3ea28946d770dc1bff1956861610b",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918245003500",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x600160005560016000fd6011600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d498db00",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600160005560016000fd6011600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcode_d0g0v1_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcode_d0g0v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0c3500",
+                    "hash" : "0xe7619005462b4e2aeba31543d1b316a258b9854af27efd4648e28725ceda8b51",
+                    "mixHash" : "0x483b9c144f4caeb2e63bf37ac71ccaa26f5085d4a15a09b310be705de9f87cd3",
+                    "nonce" : "0xe130b5b9b285619d",
+                    "number" : "0x01",
+                    "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
+                    "receiptTrie" : "0x7dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51",
+                    "stateRoot" : "0xf102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf30045b47ea8c48691ad7eabc8903d3cc479e3b6bef031a2894cf71e0232b259",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f102cc3981251cbe5daf4ce2a3ae234f7f637261060b544c461fa32e987561b7a0f30045b47ea8c48691ad7eabc8903d3cc479e3b6bef031a2894cf71e0232b259a07dcd05c790a6ed503a15b7b0688335ba95cdb30f2a078be9b467658fbf59bb51b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830c35008203e880a0483b9c144f4caeb2e63bf37ac71ccaa26f5085d4a15a09b310be705de9f87cd388e130b5b9b285619df862f8608001830c350094a0000000000000000000000000000000000000000a801ba0f4ac47ee32f13b3f54d298369a82d33ef1c80c58d04525a85e4f8fcfa57729f4a03e9fdc44de07ca288479815062ab19ff708d0180a2d80d6e77aa6562de839860c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0c3500",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf4ac47ee32f13b3f54d298369a82d33ef1c80c58d04525a85e4f8fcfa57729f4",
+                        "s" : "0x3e9fdc44de07ca288479815062ab19ff708d0180a2d80d6e77aa6562de839860",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe7619005462b4e2aeba31543d1b316a258b9854af27efd4648e28725ceda8b51",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a037",
+                "balance" : "0x4563918245003500",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -507,7 +619,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a46fc9",
+                "balance" : "0xe8d498db00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcode_d0g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcode_d0g1v0.json
index 7ece89a3a..1525b92d6 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcode_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcode_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcode_d0g1v0_EIP150" : {
+    "RevertOpcode_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcode_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x7530",
-                    "hash" : "0xb09d0aa822d4d46ce0a37ecadfd8e106bdf95e7928f6d270c409f065f8ecfd94",
-                    "mixHash" : "0x61c4a7f1447dac6d1cafd13e8871c2c56a1519a06aada7c609d310ba8ca100f2",
-                    "nonce" : "0x57990707d83ebb25",
+                    "hash" : "0xb66bc46180d94d6374975893d3a600e3741e9cf0e58ee2f8dc2396798b3556d1",
+                    "mixHash" : "0xc9ae8d116aec598f806c87292229e21741b1892eef12f2ed3945cd5ca74e0e33",
+                    "nonce" : "0x6c7227c57a63c653",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
-                    "receiptTrie" : "0x286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119e",
-                    "stateRoot" : "0x1dc0b8c728d656ce6633e47889ebdc8bf106f776690417e06df0cce1d04dc5a9",
+                    "receiptTrie" : "0x534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0b",
+                    "stateRoot" : "0x440f63d6c2de96e65c4fb51b8408cf1ca1b465ab00f902b00afb5a315dc689c9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2d85f180dcd01c3fb7c40b26ed72d5f20e662d0e891199aed5506760daae5e01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc0b8c728d656ce6633e47889ebdc8bf106f776690417e06df0cce1d04dc5a9a02d85f180dcd01c3fb7c40b26ed72d5f20e662d0e891199aed5506760daae5e01a0286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808275308203e880a061c4a7f1447dac6d1cafd13e8871c2c56a1519a06aada7c609d310ba8ca100f28857990707d83ebb25f861f85f800182753094a00000000000000000000000000000000000000080801ca095b7fdc6fa09d3b0a1678840677f22e16fb269bf17575bee54e256a698d6a16ba050ab0cf1ebcc5652f053095b3a01dd36256f9f8b2210b7cf318bfdbd2782d2fbc0",
+                "rlp" : "0xf9025ef901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0440f63d6c2de96e65c4fb51b8408cf1ca1b465ab00f902b00afb5a315dc689c9a02d85f180dcd01c3fb7c40b26ed72d5f20e662d0e891199aed5506760daae5e01a0534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808275308203e880a0c9ae8d116aec598f806c87292229e21741b1892eef12f2ed3945cd5ca74e0e33886c7227c57a63c653f861f85f800182753094a00000000000000000000000000000000000000080801ca095b7fdc6fa09d3b0a1678840677f22e16fb269bf17575bee54e256a698d6a16ba050ab0cf1ebcc5652f053095b3a01dd36256f9f8b2210b7cf318bfdbd2782d2fbc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb09d0aa822d4d46ce0a37ecadfd8e106bdf95e7928f6d270c409f065f8ecfd94",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb66bc46180d94d6374975893d3a600e3741e9cf0e58ee2f8dc2396798b3556d1",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f47530",
                 "code" : "",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "RevertOpcode_d0g1v0_EIP158" : {
+    "RevertOpcode_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcode_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x7530",
-                    "hash" : "0x9fc223f29af8b63874363d53c7204485805545ac5c0dcfcc55b4c8f8dea7f7df",
-                    "mixHash" : "0x44732bc2c948458a7423e415a8adea87f34059c88a876ac733fbf9789824525c",
-                    "nonce" : "0x5153d1d0ae6136f3",
+                    "hash" : "0x7e760e0a1c6054bbbd36070fb706ba04170e95d32d1e9e52a69e84e3213153bc",
+                    "mixHash" : "0x42ceaec78d8f116e209b26f0c2f1b900e88a437090feabe8d4b3e0d39afe3906",
+                    "nonce" : "0x8487d8247cdc87e4",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
-                    "receiptTrie" : "0x286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119e",
-                    "stateRoot" : "0x1dc0b8c728d656ce6633e47889ebdc8bf106f776690417e06df0cce1d04dc5a9",
+                    "receiptTrie" : "0x534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0b",
+                    "stateRoot" : "0x440f63d6c2de96e65c4fb51b8408cf1ca1b465ab00f902b00afb5a315dc689c9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2d85f180dcd01c3fb7c40b26ed72d5f20e662d0e891199aed5506760daae5e01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc0b8c728d656ce6633e47889ebdc8bf106f776690417e06df0cce1d04dc5a9a02d85f180dcd01c3fb7c40b26ed72d5f20e662d0e891199aed5506760daae5e01a0286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808275308203e880a044732bc2c948458a7423e415a8adea87f34059c88a876ac733fbf9789824525c885153d1d0ae6136f3f861f85f800182753094a00000000000000000000000000000000000000080801ca095b7fdc6fa09d3b0a1678840677f22e16fb269bf17575bee54e256a698d6a16ba050ab0cf1ebcc5652f053095b3a01dd36256f9f8b2210b7cf318bfdbd2782d2fbc0",
+                "rlp" : "0xf9025ef901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0440f63d6c2de96e65c4fb51b8408cf1ca1b465ab00f902b00afb5a315dc689c9a02d85f180dcd01c3fb7c40b26ed72d5f20e662d0e891199aed5506760daae5e01a0534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808275308203e880a042ceaec78d8f116e209b26f0c2f1b900e88a437090feabe8d4b3e0d39afe3906888487d8247cdc87e4f861f85f800182753094a00000000000000000000000000000000000000080801ca095b7fdc6fa09d3b0a1678840677f22e16fb269bf17575bee54e256a698d6a16ba050ab0cf1ebcc5652f053095b3a01dd36256f9f8b2210b7cf318bfdbd2782d2fbc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9fc223f29af8b63874363d53c7204485805545ac5c0dcfcc55b4c8f8dea7f7df",
-        "network" : "EIP158",
+        "lastblockhash" : "0x7e760e0a1c6054bbbd36070fb706ba04170e95d32d1e9e52a69e84e3213153bc",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f47530",
                 "code" : "",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "RevertOpcode_d0g1v0_Frontier" : {
+    "RevertOpcode_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcode_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x7530",
-                    "hash" : "0x2a606307ecd035bb1cae7dc3aed984690fd26ec14d7f332881d1a68f4d592a06",
-                    "mixHash" : "0xf7606bcd3e4c193eef763d1c96695def52c90dd6e870933c2b11138050f2f331",
-                    "nonce" : "0x1dc415ee98c38c34",
+                    "hash" : "0xfb7341efbf1671d9bb3dafd095b129a73f1ff7c2eca08e1fa9eb2a32d28f9ba8",
+                    "mixHash" : "0x907bf099408f62d1575d704d127955fc3362c4d3204a5f11788f5484aa868b66",
+                    "nonce" : "0xc3e493a492b29424",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
                     "receiptTrie" : "0x286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119e",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x2d85f180dcd01c3fb7c40b26ed72d5f20e662d0e891199aed5506760daae5e01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc0b8c728d656ce6633e47889ebdc8bf106f776690417e06df0cce1d04dc5a9a02d85f180dcd01c3fb7c40b26ed72d5f20e662d0e891199aed5506760daae5e01a0286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808275308203e880a0f7606bcd3e4c193eef763d1c96695def52c90dd6e870933c2b11138050f2f331881dc415ee98c38c34f861f85f800182753094a00000000000000000000000000000000000000080801ca095b7fdc6fa09d3b0a1678840677f22e16fb269bf17575bee54e256a698d6a16ba050ab0cf1ebcc5652f053095b3a01dd36256f9f8b2210b7cf318bfdbd2782d2fbc0",
+                "rlp" : "0xf9025ef901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc0b8c728d656ce6633e47889ebdc8bf106f776690417e06df0cce1d04dc5a9a02d85f180dcd01c3fb7c40b26ed72d5f20e662d0e891199aed5506760daae5e01a0286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808275308203e880a0907bf099408f62d1575d704d127955fc3362c4d3204a5f11788f5484aa868b6688c3e493a492b29424f861f85f800182753094a00000000000000000000000000000000000000080801ca095b7fdc6fa09d3b0a1678840677f22e16fb269bf17575bee54e256a698d6a16ba050ab0cf1ebcc5652f053095b3a01dd36256f9f8b2210b7cf318bfdbd2782d2fbc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2a606307ecd035bb1cae7dc3aed984690fd26ec14d7f332881d1a68f4d592a06",
-        "network" : "Frontier",
+        "lastblockhash" : "0xfb7341efbf1671d9bb3dafd095b129a73f1ff7c2eca08e1fa9eb2a32d28f9ba8",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f47530",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "RevertOpcode_d0g1v0_Homestead" : {
+    "RevertOpcode_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcode_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x7530",
-                    "hash" : "0x92ef01f6221aff95074e77c1700b73a9e053bfcbaba1efb9019303e0e180d325",
-                    "mixHash" : "0xe68acfb9ae158d27094f20e177329b2dbc5c0e6243d771f2a721c131d0056ee6",
-                    "nonce" : "0xe3d0692782fa8ac0",
+                    "hash" : "0x89f83beb8ea6a532ecf71bef2ae83dafd57d4a30005adf1590023fe5c457c583",
+                    "mixHash" : "0x67c80dfd1e4623f97856d03e4d5229a1f2f3556d6c4a31d31347230253e38d89",
+                    "nonce" : "0xb31112f66d5fb97f",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
                     "receiptTrie" : "0x286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119e",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x2d85f180dcd01c3fb7c40b26ed72d5f20e662d0e891199aed5506760daae5e01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc0b8c728d656ce6633e47889ebdc8bf106f776690417e06df0cce1d04dc5a9a02d85f180dcd01c3fb7c40b26ed72d5f20e662d0e891199aed5506760daae5e01a0286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808275308203e880a0e68acfb9ae158d27094f20e177329b2dbc5c0e6243d771f2a721c131d0056ee688e3d0692782fa8ac0f861f85f800182753094a00000000000000000000000000000000000000080801ca095b7fdc6fa09d3b0a1678840677f22e16fb269bf17575bee54e256a698d6a16ba050ab0cf1ebcc5652f053095b3a01dd36256f9f8b2210b7cf318bfdbd2782d2fbc0",
+                "rlp" : "0xf9025ef901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc0b8c728d656ce6633e47889ebdc8bf106f776690417e06df0cce1d04dc5a9a02d85f180dcd01c3fb7c40b26ed72d5f20e662d0e891199aed5506760daae5e01a0286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808275308203e880a067c80dfd1e4623f97856d03e4d5229a1f2f3556d6c4a31d31347230253e38d8988b31112f66d5fb97ff861f85f800182753094a00000000000000000000000000000000000000080801ca095b7fdc6fa09d3b0a1678840677f22e16fb269bf17575bee54e256a698d6a16ba050ab0cf1ebcc5652f053095b3a01dd36256f9f8b2210b7cf318bfdbd2782d2fbc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x92ef01f6221aff95074e77c1700b73a9e053bfcbaba1efb9019303e0e180d325",
-        "network" : "Homestead",
+        "lastblockhash" : "0x89f83beb8ea6a532ecf71bef2ae83dafd57d4a30005adf1590023fe5c457c583",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f47530",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "RevertOpcode_d0g1v0_Metropolis" : {
+    "RevertOpcode_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcode_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x7530",
-                    "hash" : "0x14a9250b95fa8a20f2d2e09c1b5112ca9f2e2ca99e661d9dcf5c97b77b10183e",
-                    "mixHash" : "0xadf1d29dd10e9bc721067d397a2a6335b801a00f448776dc3dee05a300daa5cc",
-                    "nonce" : "0x56e1613823f8c33c",
+                    "hash" : "0x91c5d6298e13d705a76abab7e417ea8b0153cc7a6dd412caefb223fe11965d5a",
+                    "mixHash" : "0xdee6c7545d7628b239e70a2342bc5c67cb527fe2230e4e4a267f5c790a12a0f5",
+                    "nonce" : "0x73bde30fb9c0fb11",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
-                    "receiptTrie" : "0x534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0b",
-                    "stateRoot" : "0x440f63d6c2de96e65c4fb51b8408cf1ca1b465ab00f902b00afb5a315dc689c9",
+                    "receiptTrie" : "0x286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119e",
+                    "stateRoot" : "0x1dc0b8c728d656ce6633e47889ebdc8bf106f776690417e06df0cce1d04dc5a9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2d85f180dcd01c3fb7c40b26ed72d5f20e662d0e891199aed5506760daae5e01",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0440f63d6c2de96e65c4fb51b8408cf1ca1b465ab00f902b00afb5a315dc689c9a02d85f180dcd01c3fb7c40b26ed72d5f20e662d0e891199aed5506760daae5e01a0534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808275308203e880a0adf1d29dd10e9bc721067d397a2a6335b801a00f448776dc3dee05a300daa5cc8856e1613823f8c33cf861f85f800182753094a00000000000000000000000000000000000000080801ca095b7fdc6fa09d3b0a1678840677f22e16fb269bf17575bee54e256a698d6a16ba050ab0cf1ebcc5652f053095b3a01dd36256f9f8b2210b7cf318bfdbd2782d2fbc0",
+                "rlp" : "0xf9025ef901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc0b8c728d656ce6633e47889ebdc8bf106f776690417e06df0cce1d04dc5a9a02d85f180dcd01c3fb7c40b26ed72d5f20e662d0e891199aed5506760daae5e01a0286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808275308203e880a0dee6c7545d7628b239e70a2342bc5c67cb527fe2230e4e4a267f5c790a12a0f58873bde30fb9c0fb11f861f85f800182753094a00000000000000000000000000000000000000080801ca095b7fdc6fa09d3b0a1678840677f22e16fb269bf17575bee54e256a698d6a16ba050ab0cf1ebcc5652f053095b3a01dd36256f9f8b2210b7cf318bfdbd2782d2fbc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x14a9250b95fa8a20f2d2e09c1b5112ca9f2e2ca99e661d9dcf5c97b77b10183e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x91c5d6298e13d705a76abab7e417ea8b0153cc7a6dd412caefb223fe11965d5a",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f47530",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x600160005560016000fd6011600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a49ad0",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600160005560016000fd6011600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcode_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcode_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x7530",
+                    "hash" : "0xe230f898908552dbeec89fb621908270c4fb8dd10f3f31e9ac2c50159d257286",
+                    "mixHash" : "0x15ded868910e159ca6a9b391b4f7ef79e5ba39dfc18e9f72ae524b8c232fc508",
+                    "nonce" : "0x36408dfaa58ee561",
+                    "number" : "0x01",
+                    "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
+                    "receiptTrie" : "0x286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119e",
+                    "stateRoot" : "0x1dc0b8c728d656ce6633e47889ebdc8bf106f776690417e06df0cce1d04dc5a9",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2d85f180dcd01c3fb7c40b26ed72d5f20e662d0e891199aed5506760daae5e01",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc0b8c728d656ce6633e47889ebdc8bf106f776690417e06df0cce1d04dc5a9a02d85f180dcd01c3fb7c40b26ed72d5f20e662d0e891199aed5506760daae5e01a0286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808275308203e880a015ded868910e159ca6a9b391b4f7ef79e5ba39dfc18e9f72ae524b8c232fc5088836408dfaa58ee561f861f85f800182753094a00000000000000000000000000000000000000080801ca095b7fdc6fa09d3b0a1678840677f22e16fb269bf17575bee54e256a698d6a16ba050ab0cf1ebcc5652f053095b3a01dd36256f9f8b2210b7cf318bfdbd2782d2fbc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x7530",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x95b7fdc6fa09d3b0a1678840677f22e16fb269bf17575bee54e256a698d6a16b",
+                        "s" : "0x50ab0cf1ebcc5652f053095b3a01dd36256f9f8b2210b7cf318bfdbd2782d2fb",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe230f898908552dbeec89fb621908270c4fb8dd10f3f31e9ac2c50159d257286",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f47530",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcode_d0g1v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcode_d0g1v1.json
index 9eb9351dc..d47fc5a90 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcode_d0g1v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertOpcode_d0g1v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertOpcode_d0g1v1_EIP150" : {
+    "RevertOpcode_d0g1v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcode_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x7530",
-                    "hash" : "0xba8cafcdbec1a1fefcdbc6726f36dadac331714857ee195471c2dccbdcbf9888",
-                    "mixHash" : "0x3dd958dfa665058ec8edf5a4f4c30b9ae89d3da72a976cae4c9b63ec185020da",
-                    "nonce" : "0x3dfa83dcce141774",
+                    "hash" : "0x0cdcd12dbc8570c1bb72008c7ec7f9c1167cd6e9ccdc243709c84a8830b52d8b",
+                    "mixHash" : "0xc759b2f298fb9f967a4a8f8ebcab59387899c1122c09c0e6e74df25ad79762d0",
+                    "nonce" : "0x857bf7d5c9a8574e",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
-                    "receiptTrie" : "0x286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119e",
-                    "stateRoot" : "0x1dc0b8c728d656ce6633e47889ebdc8bf106f776690417e06df0cce1d04dc5a9",
+                    "receiptTrie" : "0x534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0b",
+                    "stateRoot" : "0x440f63d6c2de96e65c4fb51b8408cf1ca1b465ab00f902b00afb5a315dc689c9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59476d40e9e95fe086974322973a1a226545371a177aa05f2935ad9b4d78a6b3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc0b8c728d656ce6633e47889ebdc8bf106f776690417e06df0cce1d04dc5a9a059476d40e9e95fe086974322973a1a226545371a177aa05f2935ad9b4d78a6b3a0286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808275308203e880a03dd958dfa665058ec8edf5a4f4c30b9ae89d3da72a976cae4c9b63ec185020da883dfa83dcce141774f861f85f800182753094a0000000000000000000000000000000000000000a801ba04a715aaccaa5905e4745ded5a9570f243709a991bfa9673ce397430ed1e91bafa06f677555a03ae2f771a0b6a584b4e521085d0b2038a20a881f89aef23e41d029c0",
+                "rlp" : "0xf9025ef901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0440f63d6c2de96e65c4fb51b8408cf1ca1b465ab00f902b00afb5a315dc689c9a059476d40e9e95fe086974322973a1a226545371a177aa05f2935ad9b4d78a6b3a0534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808275308203e880a0c759b2f298fb9f967a4a8f8ebcab59387899c1122c09c0e6e74df25ad79762d088857bf7d5c9a8574ef861f85f800182753094a0000000000000000000000000000000000000000a801ba04a715aaccaa5905e4745ded5a9570f243709a991bfa9673ce397430ed1e91bafa06f677555a03ae2f771a0b6a584b4e521085d0b2038a20a881f89aef23e41d029c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xba8cafcdbec1a1fefcdbc6726f36dadac331714857ee195471c2dccbdcbf9888",
-        "network" : "EIP150",
+        "lastblockhash" : "0x0cdcd12dbc8570c1bb72008c7ec7f9c1167cd6e9ccdc243709c84a8830b52d8b",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f47530",
                 "code" : "",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "RevertOpcode_d0g1v1_EIP158" : {
+    "RevertOpcode_d0g1v1_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcode_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x7530",
-                    "hash" : "0xd9cc9f13dd9afd6be99468c62dd2ba1b5d6b686b04ca836c8e9d49189bc5e230",
-                    "mixHash" : "0x223863733b37e270c1aa0c92c067c5e00858d85cb02ad4dc6ead8e8b7555ac5b",
-                    "nonce" : "0xb6e651ef95e4b375",
+                    "hash" : "0x2d6cd989239fd5e403b89f82002b7296c8ab407b897d8dbad2e174a3c6c90877",
+                    "mixHash" : "0xb3c4df09f95af317a3ca2f1ad4ca4bf30b68ca8d3f6dfd6e24e3e2290747a129",
+                    "nonce" : "0xa8128aad2efdcaa9",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
-                    "receiptTrie" : "0x286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119e",
-                    "stateRoot" : "0x1dc0b8c728d656ce6633e47889ebdc8bf106f776690417e06df0cce1d04dc5a9",
+                    "receiptTrie" : "0x534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0b",
+                    "stateRoot" : "0x440f63d6c2de96e65c4fb51b8408cf1ca1b465ab00f902b00afb5a315dc689c9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59476d40e9e95fe086974322973a1a226545371a177aa05f2935ad9b4d78a6b3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc0b8c728d656ce6633e47889ebdc8bf106f776690417e06df0cce1d04dc5a9a059476d40e9e95fe086974322973a1a226545371a177aa05f2935ad9b4d78a6b3a0286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808275308203e880a0223863733b37e270c1aa0c92c067c5e00858d85cb02ad4dc6ead8e8b7555ac5b88b6e651ef95e4b375f861f85f800182753094a0000000000000000000000000000000000000000a801ba04a715aaccaa5905e4745ded5a9570f243709a991bfa9673ce397430ed1e91bafa06f677555a03ae2f771a0b6a584b4e521085d0b2038a20a881f89aef23e41d029c0",
+                "rlp" : "0xf9025ef901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0440f63d6c2de96e65c4fb51b8408cf1ca1b465ab00f902b00afb5a315dc689c9a059476d40e9e95fe086974322973a1a226545371a177aa05f2935ad9b4d78a6b3a0534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808275308203e880a0b3c4df09f95af317a3ca2f1ad4ca4bf30b68ca8d3f6dfd6e24e3e2290747a12988a8128aad2efdcaa9f861f85f800182753094a0000000000000000000000000000000000000000a801ba04a715aaccaa5905e4745ded5a9570f243709a991bfa9673ce397430ed1e91bafa06f677555a03ae2f771a0b6a584b4e521085d0b2038a20a881f89aef23e41d029c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd9cc9f13dd9afd6be99468c62dd2ba1b5d6b686b04ca836c8e9d49189bc5e230",
-        "network" : "EIP158",
+        "lastblockhash" : "0x2d6cd989239fd5e403b89f82002b7296c8ab407b897d8dbad2e174a3c6c90877",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f47530",
                 "code" : "",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "RevertOpcode_d0g1v1_Frontier" : {
+    "RevertOpcode_d0g1v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcode_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x7530",
-                    "hash" : "0x3405e61c20eb72e0e92bfd54efacb47d70fc98ad964820ed2830eed5e8b53c61",
-                    "mixHash" : "0xaa7b23e818e94516d4a2e1e5927f69e0e48c5caa4cfc981c117915d56f10135a",
-                    "nonce" : "0xc804269068c2942b",
+                    "hash" : "0xa1871d823c72a64b27f5e9ac471613e046242bd9ec9437574b92a288caf418d5",
+                    "mixHash" : "0x88d57598f1ca8630fb8a40ddfdadba62207616a57bf93e90f2e2c7042732f8e0",
+                    "nonce" : "0x43bdb3f31e0d20bc",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
                     "receiptTrie" : "0x286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119e",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x59476d40e9e95fe086974322973a1a226545371a177aa05f2935ad9b4d78a6b3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc0b8c728d656ce6633e47889ebdc8bf106f776690417e06df0cce1d04dc5a9a059476d40e9e95fe086974322973a1a226545371a177aa05f2935ad9b4d78a6b3a0286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808275308203e880a0aa7b23e818e94516d4a2e1e5927f69e0e48c5caa4cfc981c117915d56f10135a88c804269068c2942bf861f85f800182753094a0000000000000000000000000000000000000000a801ba04a715aaccaa5905e4745ded5a9570f243709a991bfa9673ce397430ed1e91bafa06f677555a03ae2f771a0b6a584b4e521085d0b2038a20a881f89aef23e41d029c0",
+                "rlp" : "0xf9025ef901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc0b8c728d656ce6633e47889ebdc8bf106f776690417e06df0cce1d04dc5a9a059476d40e9e95fe086974322973a1a226545371a177aa05f2935ad9b4d78a6b3a0286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808275308203e880a088d57598f1ca8630fb8a40ddfdadba62207616a57bf93e90f2e2c7042732f8e08843bdb3f31e0d20bcf861f85f800182753094a0000000000000000000000000000000000000000a801ba04a715aaccaa5905e4745ded5a9570f243709a991bfa9673ce397430ed1e91bafa06f677555a03ae2f771a0b6a584b4e521085d0b2038a20a881f89aef23e41d029c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3405e61c20eb72e0e92bfd54efacb47d70fc98ad964820ed2830eed5e8b53c61",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa1871d823c72a64b27f5e9ac471613e046242bd9ec9437574b92a288caf418d5",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f47530",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "RevertOpcode_d0g1v1_Homestead" : {
+    "RevertOpcode_d0g1v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcode_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x7530",
-                    "hash" : "0x04a26cc2bd2c42aac32e733a6322039809d23a75a8583abbace94bca805bba65",
-                    "mixHash" : "0x904f2d5d92f7eab941cc84296851513a6af60a23116fd801567deb3790bdd7bd",
-                    "nonce" : "0xae4c5e3e83efe5de",
+                    "hash" : "0xa5f89fc6bdd538f050d1148106773ed3b8f02fc97c3b1cdfb1dff37900d72587",
+                    "mixHash" : "0xaacfa3ce507abcb13e4b7389c14aac3d86838df617747472aa4fe314b114cef8",
+                    "nonce" : "0xc69c046e4f997e4a",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
                     "receiptTrie" : "0x286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119e",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x59476d40e9e95fe086974322973a1a226545371a177aa05f2935ad9b4d78a6b3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc0b8c728d656ce6633e47889ebdc8bf106f776690417e06df0cce1d04dc5a9a059476d40e9e95fe086974322973a1a226545371a177aa05f2935ad9b4d78a6b3a0286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808275308203e880a0904f2d5d92f7eab941cc84296851513a6af60a23116fd801567deb3790bdd7bd88ae4c5e3e83efe5def861f85f800182753094a0000000000000000000000000000000000000000a801ba04a715aaccaa5905e4745ded5a9570f243709a991bfa9673ce397430ed1e91bafa06f677555a03ae2f771a0b6a584b4e521085d0b2038a20a881f89aef23e41d029c0",
+                "rlp" : "0xf9025ef901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc0b8c728d656ce6633e47889ebdc8bf106f776690417e06df0cce1d04dc5a9a059476d40e9e95fe086974322973a1a226545371a177aa05f2935ad9b4d78a6b3a0286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808275308203e880a0aacfa3ce507abcb13e4b7389c14aac3d86838df617747472aa4fe314b114cef888c69c046e4f997e4af861f85f800182753094a0000000000000000000000000000000000000000a801ba04a715aaccaa5905e4745ded5a9570f243709a991bfa9673ce397430ed1e91bafa06f677555a03ae2f771a0b6a584b4e521085d0b2038a20a881f89aef23e41d029c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x04a26cc2bd2c42aac32e733a6322039809d23a75a8583abbace94bca805bba65",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa5f89fc6bdd538f050d1148106773ed3b8f02fc97c3b1cdfb1dff37900d72587",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f47530",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "RevertOpcode_d0g1v1_Metropolis" : {
+    "RevertOpcode_d0g1v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcode_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x7530",
-                    "hash" : "0xfaf7d44607dd8d3a067560ab92251df2bd6195aae2452440aa150e1df8b24a4d",
-                    "mixHash" : "0xa30b06fd860d1d69f4ee60b4f4e0c997cc2b5fe9e8ab247ad6260a9a87cfb6ae",
-                    "nonce" : "0xf2206dc53e05a0a7",
+                    "hash" : "0xf1d63c8fc37bf54c0ea9b8db69296e3450aa1ff01cd23c8e6d74159b197feca2",
+                    "mixHash" : "0x31a39244bc5db7d2c6449e697189fe6a467bf29c84e8a475da1b3226cc541151",
+                    "nonce" : "0x24ef9469595a2b1a",
                     "number" : "0x01",
                     "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
-                    "receiptTrie" : "0x534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0b",
-                    "stateRoot" : "0x440f63d6c2de96e65c4fb51b8408cf1ca1b465ab00f902b00afb5a315dc689c9",
+                    "receiptTrie" : "0x286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119e",
+                    "stateRoot" : "0x1dc0b8c728d656ce6633e47889ebdc8bf106f776690417e06df0cce1d04dc5a9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59476d40e9e95fe086974322973a1a226545371a177aa05f2935ad9b4d78a6b3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0440f63d6c2de96e65c4fb51b8408cf1ca1b465ab00f902b00afb5a315dc689c9a059476d40e9e95fe086974322973a1a226545371a177aa05f2935ad9b4d78a6b3a0534bc8a8ee133a0149a231d40d07e2c48f12f5efa5a83b4384664950ad49de0bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808275308203e880a0a30b06fd860d1d69f4ee60b4f4e0c997cc2b5fe9e8ab247ad6260a9a87cfb6ae88f2206dc53e05a0a7f861f85f800182753094a0000000000000000000000000000000000000000a801ba04a715aaccaa5905e4745ded5a9570f243709a991bfa9673ce397430ed1e91bafa06f677555a03ae2f771a0b6a584b4e521085d0b2038a20a881f89aef23e41d029c0",
+                "rlp" : "0xf9025ef901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc0b8c728d656ce6633e47889ebdc8bf106f776690417e06df0cce1d04dc5a9a059476d40e9e95fe086974322973a1a226545371a177aa05f2935ad9b4d78a6b3a0286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808275308203e880a031a39244bc5db7d2c6449e697189fe6a467bf29c84e8a475da1b3226cc5411518824ef9469595a2b1af861f85f800182753094a0000000000000000000000000000000000000000a801ba04a715aaccaa5905e4745ded5a9570f243709a991bfa9673ce397430ed1e91bafa06f677555a03ae2f771a0b6a584b4e521085d0b2038a20a881f89aef23e41d029c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfaf7d44607dd8d3a067560ab92251df2bd6195aae2452440aa150e1df8b24a4d",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xf1d63c8fc37bf54c0ea9b8db69296e3450aa1ff01cd23c8e6d74159b197feca2",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f47530",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x600160005560016000fd6011600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a49ad0",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600160005560016000fd6011600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertOpcode_d0g1v1_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertOpcode_d0g1v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x7530",
+                    "hash" : "0x7b76bcaf0f82ab72363bb902dfdcc027929681eab83725ab676c344f88346470",
+                    "mixHash" : "0x707dbe28c084164d8071ff65c5004fc2ab6dc58d4972b8d868e9a3883f083bf0",
+                    "nonce" : "0xed7db093e2b7fb28",
+                    "number" : "0x01",
+                    "parentHash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
+                    "receiptTrie" : "0x286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119e",
+                    "stateRoot" : "0x1dc0b8c728d656ce6633e47889ebdc8bf106f776690417e06df0cce1d04dc5a9",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59476d40e9e95fe086974322973a1a226545371a177aa05f2935ad9b4d78a6b3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a0a6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc0b8c728d656ce6633e47889ebdc8bf106f776690417e06df0cce1d04dc5a9a059476d40e9e95fe086974322973a1a226545371a177aa05f2935ad9b4d78a6b3a0286199aa8d9dee68fa3740dd84e6e526389ad7bf9d0d621d06bdb35cfa2c119eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808275308203e880a0707dbe28c084164d8071ff65c5004fc2ab6dc58d4972b8d868e9a3883f083bf088ed7db093e2b7fb28f861f85f800182753094a0000000000000000000000000000000000000000a801ba04a715aaccaa5905e4745ded5a9570f243709a991bfa9673ce397430ed1e91bafa06f677555a03ae2f771a0b6a584b4e521085d0b2038a20a881f89aef23e41d029c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x7530",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4a715aaccaa5905e4745ded5a9570f243709a991bfa9673ce397430ed1e91baf",
+                        "s" : "0x6f677555a03ae2f771a0b6a584b4e521085d0b2038a20a881f89aef23e41d029",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xa6c854682c8d7fcab780f81abfbf3e260b07d83426da6387e3c8e2931943309e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0860258f673d0e6520d540eac5ce7c862a205956598d8a614db8898c8be051e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7b76bcaf0f82ab72363bb902dfdcc027929681eab83725ab676c344f88346470",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f47530",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrecompiledTouchCC_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrecompiledTouchCC_d0g0v0.json
index 5a12fa688..0ed7a834f 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrecompiledTouchCC_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrecompiledTouchCC_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertPrecompiledTouchCC_d0g0v0_EIP150" : {
+    "RevertPrecompiledTouchCC_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/stRevertTest/RevertPrecompiledTouchCC_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0xea60",
-                    "hash" : "0x4a656915969cbdfc1935014579ee979384acadd5445d8da6f31d0c0af366437f",
-                    "mixHash" : "0x6b1ca7f229578d1eb169bb4dc335231c2f486fcbaa68cb65a0177d1d678c63bc",
-                    "nonce" : "0xb192f8b548636993",
+                    "hash" : "0x425fb23771715896d5270e44d08ac22859c9e044bfb984edb20c0893d60bf614",
+                    "mixHash" : "0x39760e27f5c129868844c062085da4a6feed8265fc28c5b86d5b5e27929a8f92",
+                    "nonce" : "0x7f8b5d1d2925e1bd",
                     "number" : "0x01",
                     "parentHash" : "0xd25d932bbc1dc883b02e12c4bbe195a3d2679243f32180d0ca2b718aa9d190ca",
-                    "receiptTrie" : "0x8f37f83ec8b72e2d388f97464c56f10da0488d638026675d194ee090324fd819",
-                    "stateRoot" : "0x3508a5556d78174dedda0d155c8092cba65a8189cb0a786f1c4ffbeb80c1c8e9",
+                    "receiptTrie" : "0x595998c1d9a5a64049a0d61a9e4b6bb8c69abf9c5ced72c174322a611dfd3e44",
+                    "stateRoot" : "0xc7650aa406e232c68fcb930fdb52eaa464afb7e4d589c3bdb00cb29dbcc275b6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x65e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0d25d932bbc1dc883b02e12c4bbe195a3d2679243f32180d0ca2b718aa9d190caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa03508a5556d78174dedda0d155c8092cba65a8189cb0a786f1c4ffbeb80c1c8e9a065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a08f37f83ec8b72e2d388f97464c56f10da0488d638026675d194ee090324fd819b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a06b1ca7f229578d1eb169bb4dc335231c2f486fcbaa68cb65a0177d1d678c63bc88b192f8b548636993f861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
+                "rlp" : "0xf9025ef901f7a0d25d932bbc1dc883b02e12c4bbe195a3d2679243f32180d0ca2b718aa9d190caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0c7650aa406e232c68fcb930fdb52eaa464afb7e4d589c3bdb00cb29dbcc275b6a065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a0595998c1d9a5a64049a0d61a9e4b6bb8c69abf9c5ced72c174322a611dfd3e44b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a039760e27f5c129868844c062085da4a6feed8265fc28c5b86d5b5e27929a8f92887f8b5d1d2925e1bdf861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa035975ce728e8afffe97f3c946ca4318a051d0ebfcc701d630b9a68aa792e4c32a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4a656915969cbdfc1935014579ee979384acadd5445d8da6f31d0c0af366437f",
-        "network" : "EIP150",
+        "lastblockhash" : "0x425fb23771715896d5270e44d08ac22859c9e044bfb984edb20c0893d60bf614",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
                 "balance" : "0x4563918244f4ea60",
                 "code" : "",
@@ -216,10 +223,10 @@
             }
         }
     },
-    "RevertPrecompiledTouchCC_d0g0v0_EIP158" : {
+    "RevertPrecompiledTouchCC_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/stRevertTest/RevertPrecompiledTouchCC_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -231,18 +238,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0xea60",
-                    "hash" : "0x96fead41e79fe38fc73565bdf1a7bfc965924a5ba43251c080c2532af31a7cfa",
-                    "mixHash" : "0x93da18a454c1dc70d377658e055669fd7055496032a23b6d79bcc3ad611a4d39",
-                    "nonce" : "0x920a2ac925af3048",
+                    "hash" : "0xc47641c6133751b14c91dd42fc80cee3bca77552ddc67e1935e882743b2d0f75",
+                    "mixHash" : "0xeeaa86f14c137f0effaa4f9f47ee9c4fd4b535809d6a74cd40665fd2c3942b94",
+                    "nonce" : "0x1354eca23b247070",
                     "number" : "0x01",
                     "parentHash" : "0xd25d932bbc1dc883b02e12c4bbe195a3d2679243f32180d0ca2b718aa9d190ca",
-                    "receiptTrie" : "0x8f37f83ec8b72e2d388f97464c56f10da0488d638026675d194ee090324fd819",
-                    "stateRoot" : "0x3508a5556d78174dedda0d155c8092cba65a8189cb0a786f1c4ffbeb80c1c8e9",
+                    "receiptTrie" : "0x595998c1d9a5a64049a0d61a9e4b6bb8c69abf9c5ced72c174322a611dfd3e44",
+                    "stateRoot" : "0xc7650aa406e232c68fcb930fdb52eaa464afb7e4d589c3bdb00cb29dbcc275b6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x65e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0d25d932bbc1dc883b02e12c4bbe195a3d2679243f32180d0ca2b718aa9d190caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa03508a5556d78174dedda0d155c8092cba65a8189cb0a786f1c4ffbeb80c1c8e9a065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a08f37f83ec8b72e2d388f97464c56f10da0488d638026675d194ee090324fd819b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a093da18a454c1dc70d377658e055669fd7055496032a23b6d79bcc3ad611a4d3988920a2ac925af3048f861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
+                "rlp" : "0xf9025ef901f7a0d25d932bbc1dc883b02e12c4bbe195a3d2679243f32180d0ca2b718aa9d190caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0c7650aa406e232c68fcb930fdb52eaa464afb7e4d589c3bdb00cb29dbcc275b6a065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a0595998c1d9a5a64049a0d61a9e4b6bb8c69abf9c5ced72c174322a611dfd3e44b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a0eeaa86f14c137f0effaa4f9f47ee9c4fd4b535809d6a74cd40665fd2c3942b94881354eca23b247070f861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -279,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa035975ce728e8afffe97f3c946ca4318a051d0ebfcc701d630b9a68aa792e4c32a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x96fead41e79fe38fc73565bdf1a7bfc965924a5ba43251c080c2532af31a7cfa",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc47641c6133751b14c91dd42fc80cee3bca77552ddc67e1935e882743b2d0f75",
+        "network" : "Constantinople",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -338,6 +345,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
                 "balance" : "0x4563918244f4ea60",
                 "code" : "",
@@ -433,10 +447,10 @@
             }
         }
     },
-    "RevertPrecompiledTouchCC_d0g0v0_Frontier" : {
+    "RevertPrecompiledTouchCC_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/stRevertTest/RevertPrecompiledTouchCC_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -448,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0xea60",
-                    "hash" : "0x6062799bf0ea0e4f5ba27b14ad77091961f04c55aa6eca05513b3fd70d108b5a",
-                    "mixHash" : "0x627409afa0070de9266ae30703ae70b89bc8301f1c2ac5e49bb21d6215973992",
-                    "nonce" : "0x98ff852bd9f37624",
+                    "hash" : "0x70a748dfa47aa6208106dce76c1dc535846b638bc434883bbc5e50a9a91b4051",
+                    "mixHash" : "0x636d64f9d10e87a7d296d0d2f1e40933945bcc10bfaffd835bf7f9144c98ad36",
+                    "nonce" : "0xfc9fba5022d30700",
                     "number" : "0x01",
                     "parentHash" : "0xd25d932bbc1dc883b02e12c4bbe195a3d2679243f32180d0ca2b718aa9d190ca",
                     "receiptTrie" : "0x8f37f83ec8b72e2d388f97464c56f10da0488d638026675d194ee090324fd819",
@@ -459,7 +473,7 @@
                     "transactionsTrie" : "0x65e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0d25d932bbc1dc883b02e12c4bbe195a3d2679243f32180d0ca2b718aa9d190caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa03508a5556d78174dedda0d155c8092cba65a8189cb0a786f1c4ffbeb80c1c8e9a065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a08f37f83ec8b72e2d388f97464c56f10da0488d638026675d194ee090324fd819b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a0627409afa0070de9266ae30703ae70b89bc8301f1c2ac5e49bb21d62159739928898ff852bd9f37624f861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
+                "rlp" : "0xf9025ef901f7a0d25d932bbc1dc883b02e12c4bbe195a3d2679243f32180d0ca2b718aa9d190caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa03508a5556d78174dedda0d155c8092cba65a8189cb0a786f1c4ffbeb80c1c8e9a065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a08f37f83ec8b72e2d388f97464c56f10da0488d638026675d194ee090324fd819b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a0636d64f9d10e87a7d296d0d2f1e40933945bcc10bfaffd835bf7f9144c98ad3688fc9fba5022d30700f861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -496,8 +510,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa035975ce728e8afffe97f3c946ca4318a051d0ebfcc701d630b9a68aa792e4c32a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6062799bf0ea0e4f5ba27b14ad77091961f04c55aa6eca05513b3fd70d108b5a",
-        "network" : "Frontier",
+        "lastblockhash" : "0x70a748dfa47aa6208106dce76c1dc535846b638bc434883bbc5e50a9a91b4051",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -650,10 +664,10 @@
             }
         }
     },
-    "RevertPrecompiledTouchCC_d0g0v0_Homestead" : {
+    "RevertPrecompiledTouchCC_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/stRevertTest/RevertPrecompiledTouchCC_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -665,9 +679,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0xea60",
-                    "hash" : "0x858ab6ad7c642724c09e57457b5a7e0b3c5b6dc0205d2541be1c30f11b09ac84",
-                    "mixHash" : "0xe43307e10b2734198c0a5aebdcba91c2c8ff4194b849e99ff38a3b579a7f9bfc",
-                    "nonce" : "0xc7225edcf6898f1a",
+                    "hash" : "0x9b761d18287bf509b7c95dc743e771bfcafce9bebae280ceb97a3e34a1da8e53",
+                    "mixHash" : "0xe2d542a759c718a1153c2def0b80b68db97ac782d0c551ad32423448c7847196",
+                    "nonce" : "0x6ce4121598c89c5c",
                     "number" : "0x01",
                     "parentHash" : "0xd25d932bbc1dc883b02e12c4bbe195a3d2679243f32180d0ca2b718aa9d190ca",
                     "receiptTrie" : "0x8f37f83ec8b72e2d388f97464c56f10da0488d638026675d194ee090324fd819",
@@ -676,7 +690,7 @@
                     "transactionsTrie" : "0x65e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0d25d932bbc1dc883b02e12c4bbe195a3d2679243f32180d0ca2b718aa9d190caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa03508a5556d78174dedda0d155c8092cba65a8189cb0a786f1c4ffbeb80c1c8e9a065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a08f37f83ec8b72e2d388f97464c56f10da0488d638026675d194ee090324fd819b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a0e43307e10b2734198c0a5aebdcba91c2c8ff4194b849e99ff38a3b579a7f9bfc88c7225edcf6898f1af861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
+                "rlp" : "0xf9025ef901f7a0d25d932bbc1dc883b02e12c4bbe195a3d2679243f32180d0ca2b718aa9d190caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa03508a5556d78174dedda0d155c8092cba65a8189cb0a786f1c4ffbeb80c1c8e9a065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a08f37f83ec8b72e2d388f97464c56f10da0488d638026675d194ee090324fd819b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a0e2d542a759c718a1153c2def0b80b68db97ac782d0c551ad32423448c7847196886ce4121598c89c5cf861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -713,8 +727,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa035975ce728e8afffe97f3c946ca4318a051d0ebfcc701d630b9a68aa792e4c32a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x858ab6ad7c642724c09e57457b5a7e0b3c5b6dc0205d2541be1c30f11b09ac84",
-        "network" : "Homestead",
+        "lastblockhash" : "0x9b761d18287bf509b7c95dc743e771bfcafce9bebae280ceb97a3e34a1da8e53",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -867,10 +881,10 @@
             }
         }
     },
-    "RevertPrecompiledTouchCC_d0g0v0_Metropolis" : {
+    "RevertPrecompiledTouchCC_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/stRevertTest/RevertPrecompiledTouchCC_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -882,18 +896,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0xea60",
-                    "hash" : "0x609e269b90a90598c898f4b147df5b40e04259e5ad4e71cc552bd478f1fd7820",
-                    "mixHash" : "0xb3c6047aaa8b4ffc85a3bbf4abeeab6594db6887b61d8f17a241a14e3e36a362",
-                    "nonce" : "0x3575f8529362c7dc",
+                    "hash" : "0xeda86cbed0436197e0ddf95d53e3052f3e09e06adc98cf51334248b64f84a9e2",
+                    "mixHash" : "0x922af8443645f6ab0247c105423e3cadac2c02d8fe66eba356d87471ed867d8f",
+                    "nonce" : "0x0f5ee540bcdedfe1",
                     "number" : "0x01",
                     "parentHash" : "0xd25d932bbc1dc883b02e12c4bbe195a3d2679243f32180d0ca2b718aa9d190ca",
-                    "receiptTrie" : "0x595998c1d9a5a64049a0d61a9e4b6bb8c69abf9c5ced72c174322a611dfd3e44",
-                    "stateRoot" : "0xc7650aa406e232c68fcb930fdb52eaa464afb7e4d589c3bdb00cb29dbcc275b6",
+                    "receiptTrie" : "0x8f37f83ec8b72e2d388f97464c56f10da0488d638026675d194ee090324fd819",
+                    "stateRoot" : "0x3508a5556d78174dedda0d155c8092cba65a8189cb0a786f1c4ffbeb80c1c8e9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x65e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0d25d932bbc1dc883b02e12c4bbe195a3d2679243f32180d0ca2b718aa9d190caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0c7650aa406e232c68fcb930fdb52eaa464afb7e4d589c3bdb00cb29dbcc275b6a065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a0595998c1d9a5a64049a0d61a9e4b6bb8c69abf9c5ced72c174322a611dfd3e44b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a0b3c6047aaa8b4ffc85a3bbf4abeeab6594db6887b61d8f17a241a14e3e36a362883575f8529362c7dcf861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
+                "rlp" : "0xf9025ef901f7a0d25d932bbc1dc883b02e12c4bbe195a3d2679243f32180d0ca2b718aa9d190caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa03508a5556d78174dedda0d155c8092cba65a8189cb0a786f1c4ffbeb80c1c8e9a065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a08f37f83ec8b72e2d388f97464c56f10da0488d638026675d194ee090324fd819b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a0922af8443645f6ab0247c105423e3cadac2c02d8fe66eba356d87471ed867d8f880f5ee540bcdedfe1f861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -930,8 +944,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa035975ce728e8afffe97f3c946ca4318a051d0ebfcc701d630b9a68aa792e4c32a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x609e269b90a90598c898f4b147df5b40e04259e5ad4e71cc552bd478f1fd7820",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xeda86cbed0436197e0ddf95d53e3052f3e09e06adc98cf51334248b64f84a9e2",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -989,7 +1003,217 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
+                "balance" : "0x4563918244f4ea60",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76315a0",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x60006000600060006000600161c350f25060006000600060006000600261c350f25060006000600060006000600361c350f25060006000600060006000600461c350f25060006000600060006000600561c350f25060006000600060006000600661c350f25060006000600060006000600761c350f25060006000600060006000600861c350f2505a6001555a6002555a600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x60006000600060006000600161c350f25060006000600060006000600261c350f25060006000600060006000600361c350f25060006000600060006000600461c350f25060006000600060006000600561c350f25060006000600060006000600661c350f25060006000600060006000600761c350f25060006000600060006000600861c350f2505a6001555a6002555a600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertPrecompiledTouchCC_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertPrecompiledTouchCC_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x3d37ef",
+                    "gasUsed" : "0xea60",
+                    "hash" : "0x8ae5f22e178b8f117e0c275e5e06d54445f0ec3f0fc440dc814b5acb865d714c",
+                    "mixHash" : "0xe7ed4588af8c6bd2c135d3fe822d24eebfd6e1ee383a34c3d58da4f4d28d5c5f",
+                    "nonce" : "0xe132b8cef83f1364",
+                    "number" : "0x01",
+                    "parentHash" : "0xd25d932bbc1dc883b02e12c4bbe195a3d2679243f32180d0ca2b718aa9d190ca",
+                    "receiptTrie" : "0x8f37f83ec8b72e2d388f97464c56f10da0488d638026675d194ee090324fd819",
+                    "stateRoot" : "0x3508a5556d78174dedda0d155c8092cba65a8189cb0a786f1c4ffbeb80c1c8e9",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x65e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a0d25d932bbc1dc883b02e12c4bbe195a3d2679243f32180d0ca2b718aa9d190caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa03508a5556d78174dedda0d155c8092cba65a8189cb0a786f1c4ffbeb80c1c8e9a065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a08f37f83ec8b72e2d388f97464c56f10da0488d638026675d194ee090324fd819b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a0e7ed4588af8c6bd2c135d3fe822d24eebfd6e1ee383a34c3d58da4f4d28d5c5f88e132b8cef83f1364f861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0xea60",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x4b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526f",
+                        "s" : "0x2e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bcc",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x3d37ef",
+            "gasUsed" : "0x00",
+            "hash" : "0xd25d932bbc1dc883b02e12c4bbe195a3d2679243f32180d0ca2b718aa9d190ca",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x35975ce728e8afffe97f3c946ca4318a051d0ebfcc701d630b9a68aa792e4c32",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa035975ce728e8afffe97f3c946ca4318a051d0ebfcc701d630b9a68aa792e4c32a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8ae5f22e178b8f117e0c275e5e06d54445f0ec3f0fc440dc814b5acb865d714c",
+        "network" : "Homestead",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrecompiledTouchDC_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrecompiledTouchDC_d0g0v0.json
index 3823fff3e..b91571818 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrecompiledTouchDC_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrecompiledTouchDC_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertPrecompiledTouchDC_d0g0v0_EIP150" : {
+    "RevertPrecompiledTouchDC_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/stRevertTest/RevertPrecompiledTouchDC_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0xea60",
-                    "hash" : "0x5662edcf4a64139ef5562bbae809cf0e46dddf807b1a590b70f0e9f67fc9d40f",
-                    "mixHash" : "0xfc8d23efaaa2946f51f549da388d3db58144593d4887285d87e8479d269dd311",
-                    "nonce" : "0xa711baa3346b401d",
+                    "hash" : "0x7e158eec462afc6e1baaf3cfdfd304602fe2cec858aefe3ff3bb61b4778455e8",
+                    "mixHash" : "0x3e3448e6e419611fc303bdb20ae3e5f65ebee8f6504b670ce6f971f80f41ba75",
+                    "nonce" : "0xb947c88513414eb2",
                     "number" : "0x01",
                     "parentHash" : "0xf6af6804c5169824933a6d06c21ac104b4e91e9f3568b168c81d3ef611889082",
-                    "receiptTrie" : "0x65ab6631c04a7fb87d95a958a816108a6b4c65f43480c6e2de3ed312ffdf88c2",
-                    "stateRoot" : "0x4f8704e62f74aa364754975ef399b5db1ecf99565899a18530cbe115ab87b27d",
+                    "receiptTrie" : "0x595998c1d9a5a64049a0d61a9e4b6bb8c69abf9c5ced72c174322a611dfd3e44",
+                    "stateRoot" : "0xac5fcc7900b6f86f17a85371e67faa009827f162982eac03ce4d393d4ed5987d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x65e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f6af6804c5169824933a6d06c21ac104b4e91e9f3568b168c81d3ef611889082a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa04f8704e62f74aa364754975ef399b5db1ecf99565899a18530cbe115ab87b27da065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a065ab6631c04a7fb87d95a958a816108a6b4c65f43480c6e2de3ed312ffdf88c2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a0fc8d23efaaa2946f51f549da388d3db58144593d4887285d87e8479d269dd31188a711baa3346b401df861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
+                "rlp" : "0xf9025ef901f7a0f6af6804c5169824933a6d06c21ac104b4e91e9f3568b168c81d3ef611889082a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0ac5fcc7900b6f86f17a85371e67faa009827f162982eac03ce4d393d4ed5987da065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a0595998c1d9a5a64049a0d61a9e4b6bb8c69abf9c5ced72c174322a611dfd3e44b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a03e3448e6e419611fc303bdb20ae3e5f65ebee8f6504b670ce6f971f80f41ba7588b947c88513414eb2f861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0c96f555fa1311ffada4509592298ffd61bc45cc6c9d55e6be23f68e2cc5b04d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5662edcf4a64139ef5562bbae809cf0e46dddf807b1a590b70f0e9f67fc9d40f",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7e158eec462afc6e1baaf3cfdfd304602fe2cec858aefe3ff3bb61b4778455e8",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
                 "balance" : "0x4563918244f4ea60",
                 "code" : "",
@@ -216,10 +223,10 @@
             }
         }
     },
-    "RevertPrecompiledTouchDC_d0g0v0_EIP158" : {
+    "RevertPrecompiledTouchDC_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/stRevertTest/RevertPrecompiledTouchDC_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -231,18 +238,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0xea60",
-                    "hash" : "0xbbd9b9ae0c9b09477e85c52fa332999fcda8e76bc7e150d8e575d97fc19fb2b3",
-                    "mixHash" : "0xbfc280820da82a2fe2931c5873da2bff02c03048731ca8e4a3c2b797aac4093b",
-                    "nonce" : "0x689cbff07fc9bca2",
+                    "hash" : "0xebb11dce187696857500de6e138c44ab1c3bb460db696f141e28cb314d705471",
+                    "mixHash" : "0x7baf05f4db0153253df7a136cfb651546f6d423730e6b78b4ffe3395c4e39cbc",
+                    "nonce" : "0xed36d9fd4cfc0788",
                     "number" : "0x01",
                     "parentHash" : "0xf6af6804c5169824933a6d06c21ac104b4e91e9f3568b168c81d3ef611889082",
-                    "receiptTrie" : "0x65ab6631c04a7fb87d95a958a816108a6b4c65f43480c6e2de3ed312ffdf88c2",
-                    "stateRoot" : "0x4f8704e62f74aa364754975ef399b5db1ecf99565899a18530cbe115ab87b27d",
+                    "receiptTrie" : "0x595998c1d9a5a64049a0d61a9e4b6bb8c69abf9c5ced72c174322a611dfd3e44",
+                    "stateRoot" : "0xac5fcc7900b6f86f17a85371e67faa009827f162982eac03ce4d393d4ed5987d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x65e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f6af6804c5169824933a6d06c21ac104b4e91e9f3568b168c81d3ef611889082a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa04f8704e62f74aa364754975ef399b5db1ecf99565899a18530cbe115ab87b27da065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a065ab6631c04a7fb87d95a958a816108a6b4c65f43480c6e2de3ed312ffdf88c2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a0bfc280820da82a2fe2931c5873da2bff02c03048731ca8e4a3c2b797aac4093b88689cbff07fc9bca2f861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
+                "rlp" : "0xf9025ef901f7a0f6af6804c5169824933a6d06c21ac104b4e91e9f3568b168c81d3ef611889082a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0ac5fcc7900b6f86f17a85371e67faa009827f162982eac03ce4d393d4ed5987da065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a0595998c1d9a5a64049a0d61a9e4b6bb8c69abf9c5ced72c174322a611dfd3e44b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a07baf05f4db0153253df7a136cfb651546f6d423730e6b78b4ffe3395c4e39cbc88ed36d9fd4cfc0788f861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -279,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0c96f555fa1311ffada4509592298ffd61bc45cc6c9d55e6be23f68e2cc5b04d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbbd9b9ae0c9b09477e85c52fa332999fcda8e76bc7e150d8e575d97fc19fb2b3",
-        "network" : "EIP158",
+        "lastblockhash" : "0xebb11dce187696857500de6e138c44ab1c3bb460db696f141e28cb314d705471",
+        "network" : "Constantinople",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -338,6 +345,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
                 "balance" : "0x4563918244f4ea60",
                 "code" : "",
@@ -433,10 +447,10 @@
             }
         }
     },
-    "RevertPrecompiledTouchDC_d0g0v0_Frontier" : {
+    "RevertPrecompiledTouchDC_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/stRevertTest/RevertPrecompiledTouchDC_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -448,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0xea60",
-                    "hash" : "0x67b7b77e1eeb5c2ef7f9dd42cb272f8ed3832fe1bfb7847d1a288c45c62b6018",
-                    "mixHash" : "0xe42f39eef81f920167c3d6c8074604c42cee73408710bf01732b2cdea73d852c",
-                    "nonce" : "0x485e91e9f7b1bf10",
+                    "hash" : "0xdd2fcff1dfa90663423a96801487179159064d469ef7feaf4015ea8c09ba14b6",
+                    "mixHash" : "0x538f2c84495aeee8a8a308b469823725aa98e29f23f86dff68b9d56ce9c606ff",
+                    "nonce" : "0x84d5e804463fc969",
                     "number" : "0x01",
                     "parentHash" : "0xf6af6804c5169824933a6d06c21ac104b4e91e9f3568b168c81d3ef611889082",
                     "receiptTrie" : "0x65ab6631c04a7fb87d95a958a816108a6b4c65f43480c6e2de3ed312ffdf88c2",
@@ -459,7 +473,7 @@
                     "transactionsTrie" : "0x65e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f6af6804c5169824933a6d06c21ac104b4e91e9f3568b168c81d3ef611889082a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa04f8704e62f74aa364754975ef399b5db1ecf99565899a18530cbe115ab87b27da065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a065ab6631c04a7fb87d95a958a816108a6b4c65f43480c6e2de3ed312ffdf88c2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a0e42f39eef81f920167c3d6c8074604c42cee73408710bf01732b2cdea73d852c88485e91e9f7b1bf10f861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
+                "rlp" : "0xf9025ef901f7a0f6af6804c5169824933a6d06c21ac104b4e91e9f3568b168c81d3ef611889082a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa04f8704e62f74aa364754975ef399b5db1ecf99565899a18530cbe115ab87b27da065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a065ab6631c04a7fb87d95a958a816108a6b4c65f43480c6e2de3ed312ffdf88c2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a0538f2c84495aeee8a8a308b469823725aa98e29f23f86dff68b9d56ce9c606ff8884d5e804463fc969f861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -496,8 +510,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0c96f555fa1311ffada4509592298ffd61bc45cc6c9d55e6be23f68e2cc5b04d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x67b7b77e1eeb5c2ef7f9dd42cb272f8ed3832fe1bfb7847d1a288c45c62b6018",
-        "network" : "Frontier",
+        "lastblockhash" : "0xdd2fcff1dfa90663423a96801487179159064d469ef7feaf4015ea8c09ba14b6",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -650,10 +664,10 @@
             }
         }
     },
-    "RevertPrecompiledTouchDC_d0g0v0_Homestead" : {
+    "RevertPrecompiledTouchDC_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/stRevertTest/RevertPrecompiledTouchDC_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -665,9 +679,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0xea60",
-                    "hash" : "0x03406768e8c7e8827a52a3d7d4aa399068ac251f305e9dbce6e1e17793809d5c",
-                    "mixHash" : "0x4a71330d90e0547a784f2c6499d0ca8018b294d79a82a0bc94142fbe200fc917",
-                    "nonce" : "0xaaac8b5cf5953f66",
+                    "hash" : "0x90677c3a945211b8394f0d9097144c82dfd5cecb8f73c3553bad780caf43c4c8",
+                    "mixHash" : "0xeb49ddf86c447ce438f9eba6412aabb1ab6e7b4c93993627479b119a6f96558a",
+                    "nonce" : "0x489fd4ed6c06f001",
                     "number" : "0x01",
                     "parentHash" : "0xf6af6804c5169824933a6d06c21ac104b4e91e9f3568b168c81d3ef611889082",
                     "receiptTrie" : "0x65ab6631c04a7fb87d95a958a816108a6b4c65f43480c6e2de3ed312ffdf88c2",
@@ -676,7 +690,7 @@
                     "transactionsTrie" : "0x65e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f6af6804c5169824933a6d06c21ac104b4e91e9f3568b168c81d3ef611889082a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa04f8704e62f74aa364754975ef399b5db1ecf99565899a18530cbe115ab87b27da065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a065ab6631c04a7fb87d95a958a816108a6b4c65f43480c6e2de3ed312ffdf88c2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a04a71330d90e0547a784f2c6499d0ca8018b294d79a82a0bc94142fbe200fc91788aaac8b5cf5953f66f861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
+                "rlp" : "0xf9025ef901f7a0f6af6804c5169824933a6d06c21ac104b4e91e9f3568b168c81d3ef611889082a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa04f8704e62f74aa364754975ef399b5db1ecf99565899a18530cbe115ab87b27da065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a065ab6631c04a7fb87d95a958a816108a6b4c65f43480c6e2de3ed312ffdf88c2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a0eb49ddf86c447ce438f9eba6412aabb1ab6e7b4c93993627479b119a6f96558a88489fd4ed6c06f001f861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -713,8 +727,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0c96f555fa1311ffada4509592298ffd61bc45cc6c9d55e6be23f68e2cc5b04d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x03406768e8c7e8827a52a3d7d4aa399068ac251f305e9dbce6e1e17793809d5c",
-        "network" : "Homestead",
+        "lastblockhash" : "0x90677c3a945211b8394f0d9097144c82dfd5cecb8f73c3553bad780caf43c4c8",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -867,10 +881,10 @@
             }
         }
     },
-    "RevertPrecompiledTouchDC_d0g0v0_Metropolis" : {
+    "RevertPrecompiledTouchDC_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/stRevertTest/RevertPrecompiledTouchDC_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -882,18 +896,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0xea60",
-                    "hash" : "0x47b47d964b145e6824bf9e4420587af6185e752033c8c48b2db08f1277950b63",
-                    "mixHash" : "0xceb461c594a1eb1c7a93135f6fa4efba6415b3a6d9924316b6d6b4f78848f385",
-                    "nonce" : "0xce1f3c01b201bb10",
+                    "hash" : "0x7ba31bda78b661969cb41beb8513e32bc9cf16b41c4d36bbdb5d886d5a4e1596",
+                    "mixHash" : "0x632a1999788b2a621be26bda39a8d4369aca414352a07ca2b1e53d0f325ee9ab",
+                    "nonce" : "0x4c0c3704dca23337",
                     "number" : "0x01",
                     "parentHash" : "0xf6af6804c5169824933a6d06c21ac104b4e91e9f3568b168c81d3ef611889082",
-                    "receiptTrie" : "0x595998c1d9a5a64049a0d61a9e4b6bb8c69abf9c5ced72c174322a611dfd3e44",
-                    "stateRoot" : "0xac5fcc7900b6f86f17a85371e67faa009827f162982eac03ce4d393d4ed5987d",
+                    "receiptTrie" : "0x65ab6631c04a7fb87d95a958a816108a6b4c65f43480c6e2de3ed312ffdf88c2",
+                    "stateRoot" : "0x4f8704e62f74aa364754975ef399b5db1ecf99565899a18530cbe115ab87b27d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x65e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f6af6804c5169824933a6d06c21ac104b4e91e9f3568b168c81d3ef611889082a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0ac5fcc7900b6f86f17a85371e67faa009827f162982eac03ce4d393d4ed5987da065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a0595998c1d9a5a64049a0d61a9e4b6bb8c69abf9c5ced72c174322a611dfd3e44b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a0ceb461c594a1eb1c7a93135f6fa4efba6415b3a6d9924316b6d6b4f78848f38588ce1f3c01b201bb10f861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
+                "rlp" : "0xf9025ef901f7a0f6af6804c5169824933a6d06c21ac104b4e91e9f3568b168c81d3ef611889082a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa04f8704e62f74aa364754975ef399b5db1ecf99565899a18530cbe115ab87b27da065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a065ab6631c04a7fb87d95a958a816108a6b4c65f43480c6e2de3ed312ffdf88c2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a0632a1999788b2a621be26bda39a8d4369aca414352a07ca2b1e53d0f325ee9ab884c0c3704dca23337f861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -930,8 +944,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0c96f555fa1311ffada4509592298ffd61bc45cc6c9d55e6be23f68e2cc5b04d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x47b47d964b145e6824bf9e4420587af6185e752033c8c48b2db08f1277950b63",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x7ba31bda78b661969cb41beb8513e32bc9cf16b41c4d36bbdb5d886d5a4e1596",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -989,7 +1003,217 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
+                "balance" : "0x4563918244f4ea60",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76315a0",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600161c350f4506000600060006000600261c350f4506000600060006000600361c350f4506000600060006000600461c350f4506000600060006000600561c350f4506000600060006000600661c350f4506000600060006000600761c350f4506000600060006000600861c350f4505a6001555a6002555a600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600161c350f4506000600060006000600261c350f4506000600060006000600361c350f4506000600060006000600461c350f4506000600060006000600561c350f4506000600060006000600661c350f4506000600060006000600761c350f4506000600060006000600861c350f4505a6001555a6002555a600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertPrecompiledTouchDC_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertPrecompiledTouchDC_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x3d37ef",
+                    "gasUsed" : "0xea60",
+                    "hash" : "0x7cb5486ee357c60173e6f8fc1e2e8946bc47c64cfb5a33742d6dbfa35775ca56",
+                    "mixHash" : "0xd261b0b79f9b18f1bfc4f3aca3262066e83c6bc34e1fe81ba2b8eb9c44ebc802",
+                    "nonce" : "0xc7248b4d30225259",
+                    "number" : "0x01",
+                    "parentHash" : "0xf6af6804c5169824933a6d06c21ac104b4e91e9f3568b168c81d3ef611889082",
+                    "receiptTrie" : "0x65ab6631c04a7fb87d95a958a816108a6b4c65f43480c6e2de3ed312ffdf88c2",
+                    "stateRoot" : "0x4f8704e62f74aa364754975ef399b5db1ecf99565899a18530cbe115ab87b27d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x65e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a0f6af6804c5169824933a6d06c21ac104b4e91e9f3568b168c81d3ef611889082a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa04f8704e62f74aa364754975ef399b5db1ecf99565899a18530cbe115ab87b27da065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a065ab6631c04a7fb87d95a958a816108a6b4c65f43480c6e2de3ed312ffdf88c2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a0d261b0b79f9b18f1bfc4f3aca3262066e83c6bc34e1fe81ba2b8eb9c44ebc80288c7248b4d30225259f861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0xea60",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x4b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526f",
+                        "s" : "0x2e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bcc",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x3d37ef",
+            "gasUsed" : "0x00",
+            "hash" : "0xf6af6804c5169824933a6d06c21ac104b4e91e9f3568b168c81d3ef611889082",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc96f555fa1311ffada4509592298ffd61bc45cc6c9d55e6be23f68e2cc5b04d0",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0c96f555fa1311ffada4509592298ffd61bc45cc6c9d55e6be23f68e2cc5b04d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7cb5486ee357c60173e6f8fc1e2e8946bc47c64cfb5a33742d6dbfa35775ca56",
+        "network" : "Homestead",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrecompiledTouch_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrecompiledTouch_d0g0v0.json
index 69fab335f..62d79f973 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrecompiledTouch_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrecompiledTouch_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertPrecompiledTouch_d0g0v0_EIP150" : {
+    "RevertPrecompiledTouch_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/stRevertTest/RevertPrecompiledTouch_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0xea60",
-                    "hash" : "0x88f50544e3a4694346affd8b04a7cc030c1d107c2056bde91347c5e0bd4ab1d8",
-                    "mixHash" : "0x75dd0c71a000e08f55894e34f392b8d4a4b927bfb0aedc2e1ca947020c909f6f",
-                    "nonce" : "0xc8d679f73595bbbd",
+                    "hash" : "0x873b05cd0c0f0213788ee0aa9d35c814aeb578b6c79ff2354324ea166456a6d0",
+                    "mixHash" : "0x21fb1e18c3e2aed54c5b3d0fd0c01260d4d8d5393b2ea358b09acb973c185528",
+                    "nonce" : "0x86e06b067f58173e",
                     "number" : "0x01",
                     "parentHash" : "0x3e3b5ccb0d1ef18d51850c98d9f5672b15f503daa772b90516c5e6028ee3be79",
-                    "receiptTrie" : "0x1709aa5ceaf18e8c3d19339c5e4b214c3271d5f994ecf01a7fbf9fa69242644d",
-                    "stateRoot" : "0xb3cb57e3df6d578d205fe54782a3de58bcb34e54278c664f3338c5dde0aae1d2",
+                    "receiptTrie" : "0x595998c1d9a5a64049a0d61a9e4b6bb8c69abf9c5ced72c174322a611dfd3e44",
+                    "stateRoot" : "0x40d68cad471d8594b5a88efde3baa0678b15e24c8ef779557752cc090459e6b3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x65e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a03e3b5ccb0d1ef18d51850c98d9f5672b15f503daa772b90516c5e6028ee3be79a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0b3cb57e3df6d578d205fe54782a3de58bcb34e54278c664f3338c5dde0aae1d2a065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a01709aa5ceaf18e8c3d19339c5e4b214c3271d5f994ecf01a7fbf9fa69242644db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a075dd0c71a000e08f55894e34f392b8d4a4b927bfb0aedc2e1ca947020c909f6f88c8d679f73595bbbdf861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
+                "rlp" : "0xf9025ef901f7a03e3b5ccb0d1ef18d51850c98d9f5672b15f503daa772b90516c5e6028ee3be79a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa040d68cad471d8594b5a88efde3baa0678b15e24c8ef779557752cc090459e6b3a065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a0595998c1d9a5a64049a0d61a9e4b6bb8c69abf9c5ced72c174322a611dfd3e44b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a021fb1e18c3e2aed54c5b3d0fd0c01260d4d8d5393b2ea358b09acb973c1855288886e06b067f58173ef861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0777b383e2329bfd7fa2987fc763587f670fa7543ec746531dbc687deed861abba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x88f50544e3a4694346affd8b04a7cc030c1d107c2056bde91347c5e0bd4ab1d8",
-        "network" : "EIP150",
+        "lastblockhash" : "0x873b05cd0c0f0213788ee0aa9d35c814aeb578b6c79ff2354324ea166456a6d0",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -121,6 +121,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
                 "balance" : "0x4563918244f4ea60",
                 "code" : "",
@@ -216,10 +223,10 @@
             }
         }
     },
-    "RevertPrecompiledTouch_d0g0v0_EIP158" : {
+    "RevertPrecompiledTouch_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/stRevertTest/RevertPrecompiledTouch_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -231,18 +238,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0xea60",
-                    "hash" : "0xcbb2622e12d93ebdcec6c9d1ca777261db44c2837351f349e3e8bb71d2ed2683",
-                    "mixHash" : "0x6712d3a632b9639a31be574e92d4e96ec1c010d3ffb1f4d207c4a3bc04046903",
-                    "nonce" : "0x05bb77a8ae64bc76",
+                    "hash" : "0xec6a763be6067af2d62fcd38b0bbd40c5498250f53c0dd624e6f42ada7ede47b",
+                    "mixHash" : "0x9aa734a87e8dd6be552667924a8bd114d5dec0b716fcf508f6a73b40aba9cb35",
+                    "nonce" : "0x440b9c9cbfca96b8",
                     "number" : "0x01",
                     "parentHash" : "0x3e3b5ccb0d1ef18d51850c98d9f5672b15f503daa772b90516c5e6028ee3be79",
-                    "receiptTrie" : "0x1709aa5ceaf18e8c3d19339c5e4b214c3271d5f994ecf01a7fbf9fa69242644d",
-                    "stateRoot" : "0xb3cb57e3df6d578d205fe54782a3de58bcb34e54278c664f3338c5dde0aae1d2",
+                    "receiptTrie" : "0x595998c1d9a5a64049a0d61a9e4b6bb8c69abf9c5ced72c174322a611dfd3e44",
+                    "stateRoot" : "0x40d68cad471d8594b5a88efde3baa0678b15e24c8ef779557752cc090459e6b3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x65e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a03e3b5ccb0d1ef18d51850c98d9f5672b15f503daa772b90516c5e6028ee3be79a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0b3cb57e3df6d578d205fe54782a3de58bcb34e54278c664f3338c5dde0aae1d2a065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a01709aa5ceaf18e8c3d19339c5e4b214c3271d5f994ecf01a7fbf9fa69242644db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a06712d3a632b9639a31be574e92d4e96ec1c010d3ffb1f4d207c4a3bc040469038805bb77a8ae64bc76f861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
+                "rlp" : "0xf9025ef901f7a03e3b5ccb0d1ef18d51850c98d9f5672b15f503daa772b90516c5e6028ee3be79a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa040d68cad471d8594b5a88efde3baa0678b15e24c8ef779557752cc090459e6b3a065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a0595998c1d9a5a64049a0d61a9e4b6bb8c69abf9c5ced72c174322a611dfd3e44b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a09aa734a87e8dd6be552667924a8bd114d5dec0b716fcf508f6a73b40aba9cb3588440b9c9cbfca96b8f861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -279,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0777b383e2329bfd7fa2987fc763587f670fa7543ec746531dbc687deed861abba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcbb2622e12d93ebdcec6c9d1ca777261db44c2837351f349e3e8bb71d2ed2683",
-        "network" : "EIP158",
+        "lastblockhash" : "0xec6a763be6067af2d62fcd38b0bbd40c5498250f53c0dd624e6f42ada7ede47b",
+        "network" : "Constantinople",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -338,6 +345,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
                 "balance" : "0x4563918244f4ea60",
                 "code" : "",
@@ -433,10 +447,10 @@
             }
         }
     },
-    "RevertPrecompiledTouch_d0g0v0_Frontier" : {
+    "RevertPrecompiledTouch_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/stRevertTest/RevertPrecompiledTouch_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -448,9 +462,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0xea60",
-                    "hash" : "0x4ae4d814bc7f9a48d94f3e271b56229f5e9e204e0869faa3498ddd1b40ff86ac",
-                    "mixHash" : "0xe2ffbd906437f6b9f3d38ccc4f6954b7f3fbbfc3f81fc63fd65b7b20ff8f552a",
-                    "nonce" : "0x6fee5c16add89a54",
+                    "hash" : "0x30b3de71aea127201f272aa9296260f4bf1b3dc8943b9e32958a988c2cabbed9",
+                    "mixHash" : "0x01213879736584d70c063d1da70b7b645b27beaf72b1d543e3601f3776ab2317",
+                    "nonce" : "0x6371480cf72b9f32",
                     "number" : "0x01",
                     "parentHash" : "0x3e3b5ccb0d1ef18d51850c98d9f5672b15f503daa772b90516c5e6028ee3be79",
                     "receiptTrie" : "0x1709aa5ceaf18e8c3d19339c5e4b214c3271d5f994ecf01a7fbf9fa69242644d",
@@ -459,7 +473,7 @@
                     "transactionsTrie" : "0x65e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a03e3b5ccb0d1ef18d51850c98d9f5672b15f503daa772b90516c5e6028ee3be79a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0b3cb57e3df6d578d205fe54782a3de58bcb34e54278c664f3338c5dde0aae1d2a065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a01709aa5ceaf18e8c3d19339c5e4b214c3271d5f994ecf01a7fbf9fa69242644db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a0e2ffbd906437f6b9f3d38ccc4f6954b7f3fbbfc3f81fc63fd65b7b20ff8f552a886fee5c16add89a54f861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
+                "rlp" : "0xf9025ef901f7a03e3b5ccb0d1ef18d51850c98d9f5672b15f503daa772b90516c5e6028ee3be79a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0b3cb57e3df6d578d205fe54782a3de58bcb34e54278c664f3338c5dde0aae1d2a065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a01709aa5ceaf18e8c3d19339c5e4b214c3271d5f994ecf01a7fbf9fa69242644db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a001213879736584d70c063d1da70b7b645b27beaf72b1d543e3601f3776ab2317886371480cf72b9f32f861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -496,8 +510,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0777b383e2329bfd7fa2987fc763587f670fa7543ec746531dbc687deed861abba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4ae4d814bc7f9a48d94f3e271b56229f5e9e204e0869faa3498ddd1b40ff86ac",
-        "network" : "Frontier",
+        "lastblockhash" : "0x30b3de71aea127201f272aa9296260f4bf1b3dc8943b9e32958a988c2cabbed9",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -650,10 +664,10 @@
             }
         }
     },
-    "RevertPrecompiledTouch_d0g0v0_Homestead" : {
+    "RevertPrecompiledTouch_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/stRevertTest/RevertPrecompiledTouch_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -665,9 +679,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0xea60",
-                    "hash" : "0x5afd54c2934b274276bacefdfa7c196674d2c83eaf12e37fce3a34b1a61bfe14",
-                    "mixHash" : "0x7923dddd2166070ee7bbcc8884f3073dcb200112ae778fa3bde53466c7c5dc73",
-                    "nonce" : "0xd45f937635e59b2f",
+                    "hash" : "0x62c6c3b56c84080cf0e95e21c9797583fad68a43baf9433d438a6f1e04756bdb",
+                    "mixHash" : "0x7489e3389565ffade915e2124f032a780d1156c2db0dffc5e8fc0b933c990566",
+                    "nonce" : "0x45a70f22b5b750d5",
                     "number" : "0x01",
                     "parentHash" : "0x3e3b5ccb0d1ef18d51850c98d9f5672b15f503daa772b90516c5e6028ee3be79",
                     "receiptTrie" : "0x1709aa5ceaf18e8c3d19339c5e4b214c3271d5f994ecf01a7fbf9fa69242644d",
@@ -676,7 +690,7 @@
                     "transactionsTrie" : "0x65e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a03e3b5ccb0d1ef18d51850c98d9f5672b15f503daa772b90516c5e6028ee3be79a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0b3cb57e3df6d578d205fe54782a3de58bcb34e54278c664f3338c5dde0aae1d2a065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a01709aa5ceaf18e8c3d19339c5e4b214c3271d5f994ecf01a7fbf9fa69242644db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a07923dddd2166070ee7bbcc8884f3073dcb200112ae778fa3bde53466c7c5dc7388d45f937635e59b2ff861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
+                "rlp" : "0xf9025ef901f7a03e3b5ccb0d1ef18d51850c98d9f5672b15f503daa772b90516c5e6028ee3be79a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0b3cb57e3df6d578d205fe54782a3de58bcb34e54278c664f3338c5dde0aae1d2a065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a01709aa5ceaf18e8c3d19339c5e4b214c3271d5f994ecf01a7fbf9fa69242644db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a07489e3389565ffade915e2124f032a780d1156c2db0dffc5e8fc0b933c9905668845a70f22b5b750d5f861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -713,8 +727,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0777b383e2329bfd7fa2987fc763587f670fa7543ec746531dbc687deed861abba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5afd54c2934b274276bacefdfa7c196674d2c83eaf12e37fce3a34b1a61bfe14",
-        "network" : "Homestead",
+        "lastblockhash" : "0x62c6c3b56c84080cf0e95e21c9797583fad68a43baf9433d438a6f1e04756bdb",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -867,10 +881,10 @@
             }
         }
     },
-    "RevertPrecompiledTouch_d0g0v0_Metropolis" : {
+    "RevertPrecompiledTouch_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/stRevertTest/RevertPrecompiledTouch_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -882,18 +896,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x3d37ef",
                     "gasUsed" : "0xea60",
-                    "hash" : "0x1e76f11e390a2bf45b1365468877b426aeae2979dac13f3b4bbbc680dd38ad1a",
-                    "mixHash" : "0xdb5eeae71f7b1839641e2524d3aed0d5f03331c3b293a4b6ca820f0fe984ced4",
-                    "nonce" : "0x12b5691954f560db",
+                    "hash" : "0x22bad14af44a0d3247f59d6b815c477c600d498a52832b9598e05d41693420c6",
+                    "mixHash" : "0xe1faf079528cf3b0480920fdf82c495f92a18e19b9fd3aff9cfeba8214de38f9",
+                    "nonce" : "0x6ad3d67a560767f2",
                     "number" : "0x01",
                     "parentHash" : "0x3e3b5ccb0d1ef18d51850c98d9f5672b15f503daa772b90516c5e6028ee3be79",
-                    "receiptTrie" : "0x595998c1d9a5a64049a0d61a9e4b6bb8c69abf9c5ced72c174322a611dfd3e44",
-                    "stateRoot" : "0x40d68cad471d8594b5a88efde3baa0678b15e24c8ef779557752cc090459e6b3",
+                    "receiptTrie" : "0x1709aa5ceaf18e8c3d19339c5e4b214c3271d5f994ecf01a7fbf9fa69242644d",
+                    "stateRoot" : "0xb3cb57e3df6d578d205fe54782a3de58bcb34e54278c664f3338c5dde0aae1d2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x65e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a03e3b5ccb0d1ef18d51850c98d9f5672b15f503daa772b90516c5e6028ee3be79a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa040d68cad471d8594b5a88efde3baa0678b15e24c8ef779557752cc090459e6b3a065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a0595998c1d9a5a64049a0d61a9e4b6bb8c69abf9c5ced72c174322a611dfd3e44b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a0db5eeae71f7b1839641e2524d3aed0d5f03331c3b293a4b6ca820f0fe984ced48812b5691954f560dbf861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
+                "rlp" : "0xf9025ef901f7a03e3b5ccb0d1ef18d51850c98d9f5672b15f503daa772b90516c5e6028ee3be79a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0b3cb57e3df6d578d205fe54782a3de58bcb34e54278c664f3338c5dde0aae1d2a065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a01709aa5ceaf18e8c3d19339c5e4b214c3271d5f994ecf01a7fbf9fa69242644db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a0e1faf079528cf3b0480920fdf82c495f92a18e19b9fd3aff9cfeba8214de38f9886ad3d67a560767f2f861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -930,8 +944,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0777b383e2329bfd7fa2987fc763587f670fa7543ec746531dbc687deed861abba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1e76f11e390a2bf45b1365468877b426aeae2979dac13f3b4bbbc680dd38ad1a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x22bad14af44a0d3247f59d6b815c477c600d498a52832b9598e05d41693420c6",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -989,7 +1003,217 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da" : {
+                "balance" : "0x4563918244f4ea60",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76315a0",
+                "code" : "",
+                "nonce" : "0x02",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x60006000600060006000600161c350f15060006000600060006000600261c350f15060006000600060006000600361c350f15060006000600060006000600461c350f15060006000600060006000600561c350f15060006000600060006000600661c350f15060006000600060006000600761c350f15060006000600060006000600861c350f1505a6001555a6002555a600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x60006000600060006000600161c350f15060006000600060006000600261c350f15060006000600060006000600361c350f15060006000600060006000600461c350f15060006000600060006000600561c350f15060006000600060006000600661c350f15060006000600060006000600761c350f15060006000600060006000600861c350f1505a6001555a6002555a600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertPrecompiledTouch_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertPrecompiledTouch_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x3d37ef",
+                    "gasUsed" : "0xea60",
+                    "hash" : "0x71776c7df984e8ed3b8e293242829434750000592efca4c4fe81153dd4d8a6b6",
+                    "mixHash" : "0x2bb146d92400f64f0485967a64624b735531f8878c5cbf871cea50569cb48bb2",
+                    "nonce" : "0x56dffdd9f3d3b2df",
+                    "number" : "0x01",
+                    "parentHash" : "0x3e3b5ccb0d1ef18d51850c98d9f5672b15f503daa772b90516c5e6028ee3be79",
+                    "receiptTrie" : "0x1709aa5ceaf18e8c3d19339c5e4b214c3271d5f994ecf01a7fbf9fa69242644d",
+                    "stateRoot" : "0xb3cb57e3df6d578d205fe54782a3de58bcb34e54278c664f3338c5dde0aae1d2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x65e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a03e3b5ccb0d1ef18d51850c98d9f5672b15f503daa772b90516c5e6028ee3be79a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0b3cb57e3df6d578d205fe54782a3de58bcb34e54278c664f3338c5dde0aae1d2a065e287c0196fdeda0e68ad4be161dc31164d3972d058dd20a781272aa6117b44a01709aa5ceaf18e8c3d19339c5e4b214c3271d5f994ecf01a7fbf9fa69242644db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001833d37ef82ea608203e880a02bb146d92400f64f0485967a64624b735531f8878c5cbf871cea50569cb48bb28856dffdd9f3d3b2dff861f85f010182ea6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba04b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526fa02e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bccc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0xea60",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x01",
+                        "r" : "0x4b7f2ec87c9986426dfec45792729527b2052abc8f82289b8ebfc1e871c7526f",
+                        "s" : "0x2e135376de0973939263897a483d7f248660f75681db10f1526b4da9445d6bcc",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x68795c4aa09d6f4ed3e5deddf8c2ad3049a601da",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x3d37ef",
+            "gasUsed" : "0x00",
+            "hash" : "0x3e3b5ccb0d1ef18d51850c98d9f5672b15f503daa772b90516c5e6028ee3be79",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x777b383e2329bfd7fa2987fc763587f670fa7543ec746531dbc687deed861abb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479468795c4aa09d6f4ed3e5deddf8c2ad3049a601daa0777b383e2329bfd7fa2987fc763587f670fa7543ec746531dbc687deed861abba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080833d37ef808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x71776c7df984e8ed3b8e293242829434750000592efca4c4fe81153dd4d8a6b6",
+        "network" : "Homestead",
+        "postState" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000004" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000005" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000006" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000007" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000008" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundCallOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundCallOOG_d0g0v0.json
index 62fd63a3f..b36b67443 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundCallOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundCallOOG_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertPrefoundCallOOG_d0g0v0_EIP150" : {
+    "RevertPrefoundCallOOG_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/stRevertTest/RevertPrefoundCallOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf618",
-                    "hash" : "0x2f8c51ccf53ce75afec6a9c4dafe6a191f9ad18a232436486e6267e11343afa5",
-                    "mixHash" : "0x193ea07690538e1d0edea514a5b7630f2cbdc5cfae49869c40ec62d8a7cab74e",
-                    "nonce" : "0x3c5adc548d4b5ac8",
+                    "hash" : "0x64e6ce6dc2a4065943471fddf40840f5faeada9d5255e35ecfcd5e45e6760261",
+                    "mixHash" : "0xd4f909370f5d05dd1a8dae84eab5aa8dfb9fb65710944377ef08df872e8d035d",
+                    "nonce" : "0x4a90e5b06e7a8aef",
                     "number" : "0x01",
                     "parentHash" : "0x921fd161ae9298a613d9b96c5e61d9f70c4a7d9bce11984e0920a56697e7c883",
-                    "receiptTrie" : "0xa229ee413bd7dce849f23d74a1d94c3321d9dd90bf42388854da9b2ccba7bba4",
-                    "stateRoot" : "0x4d2d6e5f7892280515a9de1a084e1b643292aa55a4e3a6e50101d5d839c624f1",
+                    "receiptTrie" : "0xea5612179b7b4a1f92bf7fc46c363bfe9555bf38b5b90fcb10d6815123883474",
+                    "stateRoot" : "0x0ddcdacc7a08d484c956a1cd5a83584d89d3bc9a980faab7dc404dfebb191d45",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0921fd161ae9298a613d9b96c5e61d9f70c4a7d9bce11984e0920a56697e7c883a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04d2d6e5f7892280515a9de1a084e1b643292aa55a4e3a6e50101d5d839c624f1a06411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6fa0a229ee413bd7dce849f23d74a1d94c3321d9dd90bf42388854da9b2ccba7bba4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f6188203e880a0193ea07690538e1d0edea514a5b7630f2cbdc5cfae49869c40ec62d8a7cab74e883c5adc548d4b5ac8f861f85f800182f61894a00000000000000000000000000000000000000080801ca0246a61332db8981ed5eb513096f2e28373b7497fb8467c1e3af0f53f3aae0450a06d0f0e6c4c8db5b12b53089a0a80639de16cf32d1db2c3d20683e7dedb05934bc0",
+                "rlp" : "0xf9025ef901f7a0921fd161ae9298a613d9b96c5e61d9f70c4a7d9bce11984e0920a56697e7c883a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ddcdacc7a08d484c956a1cd5a83584d89d3bc9a980faab7dc404dfebb191d45a06411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6fa0ea5612179b7b4a1f92bf7fc46c363bfe9555bf38b5b90fcb10d6815123883474b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f6188203e880a0d4f909370f5d05dd1a8dae84eab5aa8dfb9fb65710944377ef08df872e8d035d884a90e5b06e7a8aeff861f85f800182f61894a00000000000000000000000000000000000000080801ca0246a61332db8981ed5eb513096f2e28373b7497fb8467c1e3af0f53f3aae0450a06d0f0e6c4c8db5b12b53089a0a80639de16cf32d1db2c3d20683e7dedb05934bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a72fab9c5ff89010e4c10a111385a55dcfb70157690a5fba8b7f02690f5c61bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2f8c51ccf53ce75afec6a9c4dafe6a191f9ad18a232436486e6267e11343afa5",
-        "network" : "EIP150",
+        "lastblockhash" : "0x64e6ce6dc2a4065943471fddf40840f5faeada9d5255e35ecfcd5e45e6760261",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f618",
                 "code" : "",
@@ -118,10 +125,10 @@
             }
         }
     },
-    "RevertPrefoundCallOOG_d0g0v0_EIP158" : {
+    "RevertPrefoundCallOOG_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/stRevertTest/RevertPrefoundCallOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -133,18 +140,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf618",
-                    "hash" : "0xe5fa13a3359977a0e65e5893b79910f97720955d98bc602dcffe2c3ff46a55ca",
-                    "mixHash" : "0x6dfe9d5d38474676abceb69facb057f1d69b03b2ab947a9748782a4d32e0bddd",
-                    "nonce" : "0xdcaacf19abac5636",
+                    "hash" : "0x0d3098bdacfe887c8b33b333752e3a97a9c7a37a578e69c1c5e9eb3385cbdece",
+                    "mixHash" : "0x1c559fede1bb77e6d8781454ef0abddcdce161bd2a04199ab017e723ec0e9bd5",
+                    "nonce" : "0xa1f0d2727a119301",
                     "number" : "0x01",
                     "parentHash" : "0x921fd161ae9298a613d9b96c5e61d9f70c4a7d9bce11984e0920a56697e7c883",
-                    "receiptTrie" : "0xa229ee413bd7dce849f23d74a1d94c3321d9dd90bf42388854da9b2ccba7bba4",
-                    "stateRoot" : "0x4d2d6e5f7892280515a9de1a084e1b643292aa55a4e3a6e50101d5d839c624f1",
+                    "receiptTrie" : "0xea5612179b7b4a1f92bf7fc46c363bfe9555bf38b5b90fcb10d6815123883474",
+                    "stateRoot" : "0x0ddcdacc7a08d484c956a1cd5a83584d89d3bc9a980faab7dc404dfebb191d45",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0921fd161ae9298a613d9b96c5e61d9f70c4a7d9bce11984e0920a56697e7c883a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04d2d6e5f7892280515a9de1a084e1b643292aa55a4e3a6e50101d5d839c624f1a06411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6fa0a229ee413bd7dce849f23d74a1d94c3321d9dd90bf42388854da9b2ccba7bba4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f6188203e880a06dfe9d5d38474676abceb69facb057f1d69b03b2ab947a9748782a4d32e0bddd88dcaacf19abac5636f861f85f800182f61894a00000000000000000000000000000000000000080801ca0246a61332db8981ed5eb513096f2e28373b7497fb8467c1e3af0f53f3aae0450a06d0f0e6c4c8db5b12b53089a0a80639de16cf32d1db2c3d20683e7dedb05934bc0",
+                "rlp" : "0xf9025ef901f7a0921fd161ae9298a613d9b96c5e61d9f70c4a7d9bce11984e0920a56697e7c883a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ddcdacc7a08d484c956a1cd5a83584d89d3bc9a980faab7dc404dfebb191d45a06411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6fa0ea5612179b7b4a1f92bf7fc46c363bfe9555bf38b5b90fcb10d6815123883474b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f6188203e880a01c559fede1bb77e6d8781454ef0abddcdce161bd2a04199ab017e723ec0e9bd588a1f0d2727a119301f861f85f800182f61894a00000000000000000000000000000000000000080801ca0246a61332db8981ed5eb513096f2e28373b7497fb8467c1e3af0f53f3aae0450a06d0f0e6c4c8db5b12b53089a0a80639de16cf32d1db2c3d20683e7dedb05934bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -181,9 +188,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a72fab9c5ff89010e4c10a111385a55dcfb70157690a5fba8b7f02690f5c61bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe5fa13a3359977a0e65e5893b79910f97720955d98bc602dcffe2c3ff46a55ca",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0d3098bdacfe887c8b33b333752e3a97a9c7a37a578e69c1c5e9eb3385cbdece",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f618",
                 "code" : "",
@@ -237,10 +251,10 @@
             }
         }
     },
-    "RevertPrefoundCallOOG_d0g0v0_Frontier" : {
+    "RevertPrefoundCallOOG_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/stRevertTest/RevertPrefoundCallOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -252,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf618",
-                    "hash" : "0xada87d871964881712f29512541e18ff41786c568b4bc88e68d0b96c0fbb59d5",
-                    "mixHash" : "0xe306934f3cd328c94c7a14f856ecaa635990341ca38c6536ada17d41494a3adc",
-                    "nonce" : "0x81c6ccfae7d6b860",
+                    "hash" : "0xdd5df69a3952301a9f147e32bd246c7d1f06a8ff7e19fd3840fda55076af5950",
+                    "mixHash" : "0x2537db824847107f05aa12b1c98cf31adab9c525cc99fda5feaa5d4849ccf399",
+                    "nonce" : "0x9366e7ac9518a57f",
                     "number" : "0x01",
                     "parentHash" : "0x921fd161ae9298a613d9b96c5e61d9f70c4a7d9bce11984e0920a56697e7c883",
                     "receiptTrie" : "0xa229ee413bd7dce849f23d74a1d94c3321d9dd90bf42388854da9b2ccba7bba4",
@@ -263,7 +277,7 @@
                     "transactionsTrie" : "0x6411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0921fd161ae9298a613d9b96c5e61d9f70c4a7d9bce11984e0920a56697e7c883a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04d2d6e5f7892280515a9de1a084e1b643292aa55a4e3a6e50101d5d839c624f1a06411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6fa0a229ee413bd7dce849f23d74a1d94c3321d9dd90bf42388854da9b2ccba7bba4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f6188203e880a0e306934f3cd328c94c7a14f856ecaa635990341ca38c6536ada17d41494a3adc8881c6ccfae7d6b860f861f85f800182f61894a00000000000000000000000000000000000000080801ca0246a61332db8981ed5eb513096f2e28373b7497fb8467c1e3af0f53f3aae0450a06d0f0e6c4c8db5b12b53089a0a80639de16cf32d1db2c3d20683e7dedb05934bc0",
+                "rlp" : "0xf9025ef901f7a0921fd161ae9298a613d9b96c5e61d9f70c4a7d9bce11984e0920a56697e7c883a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04d2d6e5f7892280515a9de1a084e1b643292aa55a4e3a6e50101d5d839c624f1a06411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6fa0a229ee413bd7dce849f23d74a1d94c3321d9dd90bf42388854da9b2ccba7bba4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f6188203e880a02537db824847107f05aa12b1c98cf31adab9c525cc99fda5feaa5d4849ccf399889366e7ac9518a57ff861f85f800182f61894a00000000000000000000000000000000000000080801ca0246a61332db8981ed5eb513096f2e28373b7497fb8467c1e3af0f53f3aae0450a06d0f0e6c4c8db5b12b53089a0a80639de16cf32d1db2c3d20683e7dedb05934bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -300,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a72fab9c5ff89010e4c10a111385a55dcfb70157690a5fba8b7f02690f5c61bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xada87d871964881712f29512541e18ff41786c568b4bc88e68d0b96c0fbb59d5",
-        "network" : "Frontier",
+        "lastblockhash" : "0xdd5df69a3952301a9f147e32bd246c7d1f06a8ff7e19fd3840fda55076af5950",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f618",
@@ -356,10 +370,10 @@
             }
         }
     },
-    "RevertPrefoundCallOOG_d0g0v0_Homestead" : {
+    "RevertPrefoundCallOOG_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/stRevertTest/RevertPrefoundCallOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -371,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf618",
-                    "hash" : "0xd8e500738783c41145863774785039d582d2666da65c006ce2a5ad6a982de2fe",
-                    "mixHash" : "0x4ad96ab114afab9cdd490edf2be2fc518794b1d94850d29858206cb774340816",
-                    "nonce" : "0x644d11fb82d1d0ac",
+                    "hash" : "0x326948d9e4c3fda53a5c1cedc7429b9d20e2e08693ee4e830287ea433ac6ed77",
+                    "mixHash" : "0xaf41a12a66f913ac2ed553207fc7176d894e1d504205da91ce7e4492f7128238",
+                    "nonce" : "0x09d08fa0798d4f42",
                     "number" : "0x01",
                     "parentHash" : "0x921fd161ae9298a613d9b96c5e61d9f70c4a7d9bce11984e0920a56697e7c883",
                     "receiptTrie" : "0xa229ee413bd7dce849f23d74a1d94c3321d9dd90bf42388854da9b2ccba7bba4",
@@ -382,7 +396,7 @@
                     "transactionsTrie" : "0x6411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0921fd161ae9298a613d9b96c5e61d9f70c4a7d9bce11984e0920a56697e7c883a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04d2d6e5f7892280515a9de1a084e1b643292aa55a4e3a6e50101d5d839c624f1a06411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6fa0a229ee413bd7dce849f23d74a1d94c3321d9dd90bf42388854da9b2ccba7bba4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f6188203e880a04ad96ab114afab9cdd490edf2be2fc518794b1d94850d29858206cb77434081688644d11fb82d1d0acf861f85f800182f61894a00000000000000000000000000000000000000080801ca0246a61332db8981ed5eb513096f2e28373b7497fb8467c1e3af0f53f3aae0450a06d0f0e6c4c8db5b12b53089a0a80639de16cf32d1db2c3d20683e7dedb05934bc0",
+                "rlp" : "0xf9025ef901f7a0921fd161ae9298a613d9b96c5e61d9f70c4a7d9bce11984e0920a56697e7c883a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04d2d6e5f7892280515a9de1a084e1b643292aa55a4e3a6e50101d5d839c624f1a06411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6fa0a229ee413bd7dce849f23d74a1d94c3321d9dd90bf42388854da9b2ccba7bba4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f6188203e880a0af41a12a66f913ac2ed553207fc7176d894e1d504205da91ce7e4492f71282388809d08fa0798d4f42f861f85f800182f61894a00000000000000000000000000000000000000080801ca0246a61332db8981ed5eb513096f2e28373b7497fb8467c1e3af0f53f3aae0450a06d0f0e6c4c8db5b12b53089a0a80639de16cf32d1db2c3d20683e7dedb05934bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -419,8 +433,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a72fab9c5ff89010e4c10a111385a55dcfb70157690a5fba8b7f02690f5c61bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd8e500738783c41145863774785039d582d2666da65c006ce2a5ad6a982de2fe",
-        "network" : "Homestead",
+        "lastblockhash" : "0x326948d9e4c3fda53a5c1cedc7429b9d20e2e08693ee4e830287ea433ac6ed77",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f618",
@@ -475,10 +489,10 @@
             }
         }
     },
-    "RevertPrefoundCallOOG_d0g0v0_Metropolis" : {
+    "RevertPrefoundCallOOG_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/stRevertTest/RevertPrefoundCallOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -490,18 +504,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf618",
-                    "hash" : "0x1c46e4b0c422387bf055f946cc47607f856b65c8e9961cdee831a1e2c8808f6d",
-                    "mixHash" : "0x213ce0cd6e28b5e1eeb7768388cc9e9d9a7790759877e222f9c2a00c979ef106",
-                    "nonce" : "0x86668895d4062848",
+                    "hash" : "0x291e831d893a12b73865289a31ee9a9008edd8bfc0971981719f7e0786d4ad23",
+                    "mixHash" : "0x7697592a59e4ee2de9c01c4503c9152d0209bda1f429598c590ca7d102f09f67",
+                    "nonce" : "0xdc6dcb3287905225",
                     "number" : "0x01",
                     "parentHash" : "0x921fd161ae9298a613d9b96c5e61d9f70c4a7d9bce11984e0920a56697e7c883",
-                    "receiptTrie" : "0xea5612179b7b4a1f92bf7fc46c363bfe9555bf38b5b90fcb10d6815123883474",
-                    "stateRoot" : "0x0ddcdacc7a08d484c956a1cd5a83584d89d3bc9a980faab7dc404dfebb191d45",
+                    "receiptTrie" : "0xa229ee413bd7dce849f23d74a1d94c3321d9dd90bf42388854da9b2ccba7bba4",
+                    "stateRoot" : "0x4d2d6e5f7892280515a9de1a084e1b643292aa55a4e3a6e50101d5d839c624f1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0921fd161ae9298a613d9b96c5e61d9f70c4a7d9bce11984e0920a56697e7c883a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ddcdacc7a08d484c956a1cd5a83584d89d3bc9a980faab7dc404dfebb191d45a06411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6fa0ea5612179b7b4a1f92bf7fc46c363bfe9555bf38b5b90fcb10d6815123883474b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f6188203e880a0213ce0cd6e28b5e1eeb7768388cc9e9d9a7790759877e222f9c2a00c979ef1068886668895d4062848f861f85f800182f61894a00000000000000000000000000000000000000080801ca0246a61332db8981ed5eb513096f2e28373b7497fb8467c1e3af0f53f3aae0450a06d0f0e6c4c8db5b12b53089a0a80639de16cf32d1db2c3d20683e7dedb05934bc0",
+                "rlp" : "0xf9025ef901f7a0921fd161ae9298a613d9b96c5e61d9f70c4a7d9bce11984e0920a56697e7c883a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04d2d6e5f7892280515a9de1a084e1b643292aa55a4e3a6e50101d5d839c624f1a06411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6fa0a229ee413bd7dce849f23d74a1d94c3321d9dd90bf42388854da9b2ccba7bba4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f6188203e880a07697592a59e4ee2de9c01c4503c9152d0209bda1f429598c590ca7d102f09f6788dc6dcb3287905225f861f85f800182f61894a00000000000000000000000000000000000000080801ca0246a61332db8981ed5eb513096f2e28373b7497fb8467c1e3af0f53f3aae0450a06d0f0e6c4c8db5b12b53089a0a80639de16cf32d1db2c3d20683e7dedb05934bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -538,16 +552,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a72fab9c5ff89010e4c10a111385a55dcfb70157690a5fba8b7f02690f5c61bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1c46e4b0c422387bf055f946cc47607f856b65c8e9961cdee831a1e2c8808f6d",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x291e831d893a12b73865289a31ee9a9008edd8bfc0971981719f7e0786d4ad23",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f618",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60206000602060006000737db299e0885c85039f56fa504a13dd8ce8a56aa761c350f1600055600c600155600c600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a419e8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60206000602060006000737db299e0885c85039f56fa504a13dd8ce8a56aa761c350f1600055600c600155600c600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertPrefoundCallOOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertPrefoundCallOOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf618",
+                    "hash" : "0x23ff915453413a2bbc2d6400964c2bb787fa3c86c18920d71611e4f8cf65041e",
+                    "mixHash" : "0x6e3222c358247021f57932460900998ed2558caa2770dcbf0efee0f0662221cb",
+                    "nonce" : "0xf3d7d98309e1635d",
+                    "number" : "0x01",
+                    "parentHash" : "0x921fd161ae9298a613d9b96c5e61d9f70c4a7d9bce11984e0920a56697e7c883",
+                    "receiptTrie" : "0xa229ee413bd7dce849f23d74a1d94c3321d9dd90bf42388854da9b2ccba7bba4",
+                    "stateRoot" : "0x4d2d6e5f7892280515a9de1a084e1b643292aa55a4e3a6e50101d5d839c624f1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a0921fd161ae9298a613d9b96c5e61d9f70c4a7d9bce11984e0920a56697e7c883a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04d2d6e5f7892280515a9de1a084e1b643292aa55a4e3a6e50101d5d839c624f1a06411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6fa0a229ee413bd7dce849f23d74a1d94c3321d9dd90bf42388854da9b2ccba7bba4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f6188203e880a06e3222c358247021f57932460900998ed2558caa2770dcbf0efee0f0662221cb88f3d7d98309e1635df861f85f800182f61894a00000000000000000000000000000000000000080801ca0246a61332db8981ed5eb513096f2e28373b7497fb8467c1e3af0f53f3aae0450a06d0f0e6c4c8db5b12b53089a0a80639de16cf32d1db2c3d20683e7dedb05934bc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0xf618",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x246a61332db8981ed5eb513096f2e28373b7497fb8467c1e3af0f53f3aae0450",
+                        "s" : "0x6d0f0e6c4c8db5b12b53089a0a80639de16cf32d1db2c3d20683e7dedb05934b",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x921fd161ae9298a613d9b96c5e61d9f70c4a7d9bce11984e0920a56697e7c883",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa72fab9c5ff89010e4c10a111385a55dcfb70157690a5fba8b7f02690f5c61bc",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a72fab9c5ff89010e4c10a111385a55dcfb70157690a5fba8b7f02690f5c61bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x23ff915453413a2bbc2d6400964c2bb787fa3c86c18920d71611e4f8cf65041e",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f618",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundCall_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundCall_d0g0v0.json
index b78145be1..7d14e5a82 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundCall_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundCall_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertPrefoundCall_d0g0v0_EIP150" : {
+    "RevertPrefoundCall_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/stRevertTest/RevertPrefoundCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf125",
-                    "hash" : "0xb05760ed44c9b392f2bd73f38fce72dcae2bdd89908c175db3902888123c1bd8",
-                    "mixHash" : "0xfc4faeb7708ac66314dd75efb9b11c17a14e43c624c2110ac84682c7de7a95cd",
-                    "nonce" : "0x8a9bae7f2ec8a75a",
+                    "hash" : "0xb626de57ab164044f2918cee0cb0fc3576d1f8ee28416876055fb95f68bce5dd",
+                    "mixHash" : "0xb35b87f2b2ef278682a5ddd5367853a3358193c9a3f1b052c9b90e9aafd6fb90",
+                    "nonce" : "0xad91a39746d033b6",
                     "number" : "0x01",
                     "parentHash" : "0x91b900a08ba8983c1ba26651a7b1e15d93443052c010ed66bb28c07abd1924a1",
-                    "receiptTrie" : "0x8017425630c7106f42d4b32d5052fe4243f4bb96906fdaf2baf4d52df78ac074",
-                    "stateRoot" : "0xd8c07094df70e01028d60faee76f30f36e14ddaea8fd9ddd8a71e54fbb3ea95f",
+                    "receiptTrie" : "0x86d362c081799ce8243ede2d228ed8381feeced7c6593bf21b46ccd1f85c5bad",
+                    "stateRoot" : "0x649a479ec3a055a618d3c0340e31b24523cf8bbd8692aadb7362937ee9cdb164",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a091b900a08ba8983c1ba26651a7b1e15d93443052c010ed66bb28c07abd1924a1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8c07094df70e01028d60faee76f30f36e14ddaea8fd9ddd8a71e54fbb3ea95fa0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a08017425630c7106f42d4b32d5052fe4243f4bb96906fdaf2baf4d52df78ac074b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1258203e880a0fc4faeb7708ac66314dd75efb9b11c17a14e43c624c2110ac84682c7de7a95cd888a9bae7f2ec8a75af862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
+                "rlp" : "0xf9025ff901f7a091b900a08ba8983c1ba26651a7b1e15d93443052c010ed66bb28c07abd1924a1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0649a479ec3a055a618d3c0340e31b24523cf8bbd8692aadb7362937ee9cdb164a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a086d362c081799ce8243ede2d228ed8381feeced7c6593bf21b46ccd1f85c5badb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1258203e880a0b35b87f2b2ef278682a5ddd5367853a3358193c9a3f1b052c9b90e9aafd6fb9088ad91a39746d033b6f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d724ee677176a63766e097d384d6e9d20f20143548420f42730e3807d825612ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb05760ed44c9b392f2bd73f38fce72dcae2bdd89908c175db3902888123c1bd8",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb626de57ab164044f2918cee0cb0fc3576d1f8ee28416876055fb95f68bce5dd",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f125",
                 "code" : "",
@@ -120,10 +127,138 @@
             }
         }
     },
-    "RevertPrefoundCall_d0g0v0_EIP158" : {
+    "RevertPrefoundCall_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertPrefoundCall_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf125",
+                    "hash" : "0xcb319b853be5b3cfea8abefe8bc4b634d9a01b2a563736f9f2bd8d4a6966a7eb",
+                    "mixHash" : "0x7d15f545d7099c15da5005aab4af8e53960c66cea91238c8a20387ca663ca866",
+                    "nonce" : "0x30bfb4ac3a904126",
+                    "number" : "0x01",
+                    "parentHash" : "0x91b900a08ba8983c1ba26651a7b1e15d93443052c010ed66bb28c07abd1924a1",
+                    "receiptTrie" : "0x86d362c081799ce8243ede2d228ed8381feeced7c6593bf21b46ccd1f85c5bad",
+                    "stateRoot" : "0x649a479ec3a055a618d3c0340e31b24523cf8bbd8692aadb7362937ee9cdb164",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xbe92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a091b900a08ba8983c1ba26651a7b1e15d93443052c010ed66bb28c07abd1924a1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0649a479ec3a055a618d3c0340e31b24523cf8bbd8692aadb7362937ee9cdb164a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a086d362c081799ce8243ede2d228ed8381feeced7c6593bf21b46ccd1f85c5badb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1258203e880a07d15f545d7099c15da5005aab4af8e53960c66cea91238c8a20387ca663ca8668830bfb4ac3a904126f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x016f30",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfd",
+                        "s" : "0x6abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x91b900a08ba8983c1ba26651a7b1e15d93443052c010ed66bb28c07abd1924a1",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd724ee677176a63766e097d384d6e9d20f20143548420f42730e3807d825612c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d724ee677176a63766e097d384d6e9d20f20143548420f42730e3807d825612ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcb319b853be5b3cfea8abefe8bc4b634d9a01b2a563736f9f2bd8d4a6966a7eb",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f125",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60206000602060006000737db299e0885c85039f56fa504a13dd8ce8a56aa761c350f1600055600c600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x0c"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a41edb",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60206000602060006000737db299e0885c85039f56fa504a13dd8ce8a56aa761c350f1600055600c600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertPrefoundCall_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/stRevertTest/RevertPrefoundCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,9 +270,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf125",
-                    "hash" : "0x68c86b25595e16b964158983074ee860af1ffee5f1e31959f6d8e142b3e19afa",
-                    "mixHash" : "0xe285b3dc703b46fca536589821e99d311714b73938385a05f6830d73baf857ea",
-                    "nonce" : "0x00c4da2d0b7ed770",
+                    "hash" : "0xacea009e08bb32c98dd5fc13c34fc717d806b21699b6b63090b530939fb08bd9",
+                    "mixHash" : "0x64cdf78d71c28699f7cf0ef0ac415a43b7a312c37627c8c5dea3c5bba055a9d2",
+                    "nonce" : "0xeb27df1d8cad1212",
                     "number" : "0x01",
                     "parentHash" : "0x91b900a08ba8983c1ba26651a7b1e15d93443052c010ed66bb28c07abd1924a1",
                     "receiptTrie" : "0x8017425630c7106f42d4b32d5052fe4243f4bb96906fdaf2baf4d52df78ac074",
@@ -146,7 +281,7 @@
                     "transactionsTrie" : "0xbe92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a091b900a08ba8983c1ba26651a7b1e15d93443052c010ed66bb28c07abd1924a1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8c07094df70e01028d60faee76f30f36e14ddaea8fd9ddd8a71e54fbb3ea95fa0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a08017425630c7106f42d4b32d5052fe4243f4bb96906fdaf2baf4d52df78ac074b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1258203e880a0e285b3dc703b46fca536589821e99d311714b73938385a05f6830d73baf857ea8800c4da2d0b7ed770f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
+                "rlp" : "0xf9025ff901f7a091b900a08ba8983c1ba26651a7b1e15d93443052c010ed66bb28c07abd1924a1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8c07094df70e01028d60faee76f30f36e14ddaea8fd9ddd8a71e54fbb3ea95fa0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a08017425630c7106f42d4b32d5052fe4243f4bb96906fdaf2baf4d52df78ac074b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1258203e880a064cdf78d71c28699f7cf0ef0ac415a43b7a312c37627c8c5dea3c5bba055a9d288eb27df1d8cad1212f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,8 +318,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d724ee677176a63766e097d384d6e9d20f20143548420f42730e3807d825612ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x68c86b25595e16b964158983074ee860af1ffee5f1e31959f6d8e142b3e19afa",
-        "network" : "EIP158",
+        "lastblockhash" : "0xacea009e08bb32c98dd5fc13c34fc717d806b21699b6b63090b530939fb08bd9",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f125",
@@ -241,10 +376,10 @@
             }
         }
     },
-    "RevertPrefoundCall_d0g0v0_Frontier" : {
+    "RevertPrefoundCall_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/stRevertTest/RevertPrefoundCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -255,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xee91",
-                    "hash" : "0x994ec81a536d600c4dcedbd4847d041671a645089ca4d13202ce2a149f0b15a9",
-                    "mixHash" : "0xe019882aa8e183668da0119a83fe82cd521c0b4ea78b5eac013628a05e5884b5",
-                    "nonce" : "0x9088414f83b28fb9",
+                    "gasUsed" : "0xf125",
+                    "hash" : "0x4dd4733d53a677ca93e9f27fb6ffa2b3cd1bda8edb8c0750a7edde65db1f206b",
+                    "mixHash" : "0x492fb30242911432f58ca137f2c453523e7174c5555444c569bbcbabd7c27879",
+                    "nonce" : "0x2ad80c53e91a9f70",
                     "number" : "0x01",
                     "parentHash" : "0x91b900a08ba8983c1ba26651a7b1e15d93443052c010ed66bb28c07abd1924a1",
-                    "receiptTrie" : "0xfe5030c549bdb439ecef4caf390645a445b3f8c91c950b57902ce2f6a33c76b9",
-                    "stateRoot" : "0x27212935b09ea278169e69358916211b8c7a48b4c7495aa617c36c6ad8e30de7",
+                    "receiptTrie" : "0x8017425630c7106f42d4b32d5052fe4243f4bb96906fdaf2baf4d52df78ac074",
+                    "stateRoot" : "0xd8c07094df70e01028d60faee76f30f36e14ddaea8fd9ddd8a71e54fbb3ea95f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a091b900a08ba8983c1ba26651a7b1e15d93443052c010ed66bb28c07abd1924a1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027212935b09ea278169e69358916211b8c7a48b4c7495aa617c36c6ad8e30de7a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0fe5030c549bdb439ecef4caf390645a445b3f8c91c950b57902ce2f6a33c76b9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee918203e880a0e019882aa8e183668da0119a83fe82cd521c0b4ea78b5eac013628a05e5884b5889088414f83b28fb9f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
+                "rlp" : "0xf9025ff901f7a091b900a08ba8983c1ba26651a7b1e15d93443052c010ed66bb28c07abd1924a1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8c07094df70e01028d60faee76f30f36e14ddaea8fd9ddd8a71e54fbb3ea95fa0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a08017425630c7106f42d4b32d5052fe4243f4bb96906fdaf2baf4d52df78ac074b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1258203e880a0492fb30242911432f58ca137f2c453523e7174c5555444c569bbcbabd7c27879882ad80c53e91a9f70f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,11 +439,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d724ee677176a63766e097d384d6e9d20f20143548420f42730e3807d825612ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x994ec81a536d600c4dcedbd4847d041671a645089ca4d13202ce2a149f0b15a9",
-        "network" : "Frontier",
+        "lastblockhash" : "0x4dd4733d53a677ca93e9f27fb6ffa2b3cd1bda8edb8c0750a7edde65db1f206b",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4ee91",
+                "balance" : "0x4563918244f4f125",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -331,7 +466,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a4216f",
+                "balance" : "0xe8d4a41edb",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -362,10 +497,10 @@
             }
         }
     },
-    "RevertPrefoundCall_d0g0v0_Homestead" : {
+    "RevertPrefoundCall_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/stRevertTest/RevertPrefoundCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +512,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xee91",
-                    "hash" : "0x174f389325f827338ce4f004e6f44022c993d9de62eee5de624dc2d54a224ca8",
-                    "mixHash" : "0xd329d87428c03e170a5773316d386bded8452528ea3530a5eeb3252765e4c72c",
-                    "nonce" : "0x316839b70339cbef",
+                    "hash" : "0xd8470151e38ddd626c4701643863e7449da74359520b06d1106c4d85d5c14c23",
+                    "mixHash" : "0x5549aca62b7e515bee48d0298c59bf9439f03e38bc5c0badd924c768925461e9",
+                    "nonce" : "0xe059dc3f857be2ea",
                     "number" : "0x01",
                     "parentHash" : "0x91b900a08ba8983c1ba26651a7b1e15d93443052c010ed66bb28c07abd1924a1",
                     "receiptTrie" : "0xfe5030c549bdb439ecef4caf390645a445b3f8c91c950b57902ce2f6a33c76b9",
@@ -388,7 +523,7 @@
                     "transactionsTrie" : "0xbe92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a091b900a08ba8983c1ba26651a7b1e15d93443052c010ed66bb28c07abd1924a1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027212935b09ea278169e69358916211b8c7a48b4c7495aa617c36c6ad8e30de7a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0fe5030c549bdb439ecef4caf390645a445b3f8c91c950b57902ce2f6a33c76b9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee918203e880a0d329d87428c03e170a5773316d386bded8452528ea3530a5eeb3252765e4c72c88316839b70339cbeff862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
+                "rlp" : "0xf9025ff901f7a091b900a08ba8983c1ba26651a7b1e15d93443052c010ed66bb28c07abd1924a1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027212935b09ea278169e69358916211b8c7a48b4c7495aa617c36c6ad8e30de7a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0fe5030c549bdb439ecef4caf390645a445b3f8c91c950b57902ce2f6a33c76b9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee918203e880a05549aca62b7e515bee48d0298c59bf9439f03e38bc5c0badd924c768925461e988e059dc3f857be2eaf862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +560,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d724ee677176a63766e097d384d6e9d20f20143548420f42730e3807d825612ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x174f389325f827338ce4f004e6f44022c993d9de62eee5de624dc2d54a224ca8",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd8470151e38ddd626c4701643863e7449da74359520b06d1106c4d85d5c14c23",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4ee91",
@@ -483,10 +618,10 @@
             }
         }
     },
-    "RevertPrefoundCall_d0g0v0_Metropolis" : {
+    "RevertPrefoundCall_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertPrefoundCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -497,19 +632,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf125",
-                    "hash" : "0xac9af641a0a3f6ed7f299fc22efce2f12b5311e10c0f479feed7d88390424cec",
-                    "mixHash" : "0xf9f9d9344e105f7ace5c6f5a45be3079932f27aef014ede49a521b4b8a8f3d5b",
-                    "nonce" : "0xcda8468dc6682f5e",
+                    "gasUsed" : "0xee91",
+                    "hash" : "0xd12e7a339a558b5c4276ba6bb058eb278a04ab986f085d302902b67291c686f2",
+                    "mixHash" : "0x709c20e2b4c3a6889c16e4c881e019335a45955a0206d6cd66a75209997b3031",
+                    "nonce" : "0x1025e52bb44a49ab",
                     "number" : "0x01",
                     "parentHash" : "0x91b900a08ba8983c1ba26651a7b1e15d93443052c010ed66bb28c07abd1924a1",
-                    "receiptTrie" : "0x86d362c081799ce8243ede2d228ed8381feeced7c6593bf21b46ccd1f85c5bad",
-                    "stateRoot" : "0x649a479ec3a055a618d3c0340e31b24523cf8bbd8692aadb7362937ee9cdb164",
+                    "receiptTrie" : "0xfe5030c549bdb439ecef4caf390645a445b3f8c91c950b57902ce2f6a33c76b9",
+                    "stateRoot" : "0x27212935b09ea278169e69358916211b8c7a48b4c7495aa617c36c6ad8e30de7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a091b900a08ba8983c1ba26651a7b1e15d93443052c010ed66bb28c07abd1924a1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0649a479ec3a055a618d3c0340e31b24523cf8bbd8692aadb7362937ee9cdb164a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a086d362c081799ce8243ede2d228ed8381feeced7c6593bf21b46ccd1f85c5badb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1258203e880a0f9f9d9344e105f7ace5c6f5a45be3079932f27aef014ede49a521b4b8a8f3d5b88cda8468dc6682f5ef862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
+                "rlp" : "0xf9025ff901f7a091b900a08ba8983c1ba26651a7b1e15d93443052c010ed66bb28c07abd1924a1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027212935b09ea278169e69358916211b8c7a48b4c7495aa617c36c6ad8e30de7a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0fe5030c549bdb439ecef4caf390645a445b3f8c91c950b57902ce2f6a33c76b9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee918203e880a0709c20e2b4c3a6889c16e4c881e019335a45955a0206d6cd66a75209997b3031881025e52bb44a49abf862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -546,18 +681,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d724ee677176a63766e097d384d6e9d20f20143548420f42730e3807d825612ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xac9af641a0a3f6ed7f299fc22efce2f12b5311e10c0f479feed7d88390424cec",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd12e7a339a558b5c4276ba6bb058eb278a04ab986f085d302902b67291c686f2",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f125",
+                "balance" : "0x4563918244f4ee91",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -580,7 +708,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a41edb",
+                "balance" : "0xe8d4a4216f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCallOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCallOOG_d0g0v0.json
index 0752fd4a8..5ec11eb4d 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCallOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCallOOG_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertPrefoundEmptyCallOOG_d0g0v0_EIP150" : {
+    "RevertPrefoundEmptyCallOOG_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/stRevertTest/RevertPrefoundEmptyCallOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf618",
-                    "hash" : "0x749c83d1c32c719634f6dee804c4bde99d7fe3d590b020d3ee57effea2878383",
-                    "mixHash" : "0x0dd8bcf59bc22184653bf1c9ea112a4363f9c6c60e88420cb828cab59ca3c417",
-                    "nonce" : "0x54412da2c5cb353f",
+                    "hash" : "0x7186272e06f6d040fe81084bffbf4dd713e416204cb2557f37e376dd89fff5bd",
+                    "mixHash" : "0x11d48aed9c13a8980f8d213223cf562367a8530f95e99cba6dcab0a697202f36",
+                    "nonce" : "0xb59504abd1096d24",
                     "number" : "0x01",
                     "parentHash" : "0x4819c44c75c3dcaa32d54c056e613da983bd8b86001ad01d0d97d9c0ca0703a9",
-                    "receiptTrie" : "0x667733204067902fa0a97ad2255b81d9c992416f45a2bb4ff5ae62566ce841a0",
-                    "stateRoot" : "0xad1a02ff92470ea61eca52f955397823d9f8da21d2e403634e632b056468adbc",
+                    "receiptTrie" : "0xea5612179b7b4a1f92bf7fc46c363bfe9555bf38b5b90fcb10d6815123883474",
+                    "stateRoot" : "0x79242497e4b8bf3e9859b9d07efb959336f6834dcf36a9bf2b6d6ead5864f64b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a04819c44c75c3dcaa32d54c056e613da983bd8b86001ad01d0d97d9c0ca0703a9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad1a02ff92470ea61eca52f955397823d9f8da21d2e403634e632b056468adbca06411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6fa0667733204067902fa0a97ad2255b81d9c992416f45a2bb4ff5ae62566ce841a0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f6188203e880a00dd8bcf59bc22184653bf1c9ea112a4363f9c6c60e88420cb828cab59ca3c4178854412da2c5cb353ff861f85f800182f61894a00000000000000000000000000000000000000080801ca0246a61332db8981ed5eb513096f2e28373b7497fb8467c1e3af0f53f3aae0450a06d0f0e6c4c8db5b12b53089a0a80639de16cf32d1db2c3d20683e7dedb05934bc0",
+                "rlp" : "0xf9025ef901f7a04819c44c75c3dcaa32d54c056e613da983bd8b86001ad01d0d97d9c0ca0703a9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa079242497e4b8bf3e9859b9d07efb959336f6834dcf36a9bf2b6d6ead5864f64ba06411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6fa0ea5612179b7b4a1f92bf7fc46c363bfe9555bf38b5b90fcb10d6815123883474b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f6188203e880a011d48aed9c13a8980f8d213223cf562367a8530f95e99cba6dcab0a697202f3688b59504abd1096d24f861f85f800182f61894a00000000000000000000000000000000000000080801ca0246a61332db8981ed5eb513096f2e28373b7497fb8467c1e3af0f53f3aae0450a06d0f0e6c4c8db5b12b53089a0a80639de16cf32d1db2c3d20683e7dedb05934bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d9d706af5a8dae2ee0a8cbf1ed5f851b483ea075847e28fe03420497778ce14a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x749c83d1c32c719634f6dee804c4bde99d7fe3d590b020d3ee57effea2878383",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7186272e06f6d040fe81084bffbf4dd713e416204cb2557f37e376dd89fff5bd",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f618",
                 "code" : "",
@@ -118,10 +125,10 @@
             }
         }
     },
-    "RevertPrefoundEmptyCallOOG_d0g0v0_EIP158" : {
+    "RevertPrefoundEmptyCallOOG_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/stRevertTest/RevertPrefoundEmptyCallOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -133,18 +140,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf618",
-                    "hash" : "0x40ae52cc65269067b33f95c2c97d911e71504cbb49d320915261324d42046b0d",
-                    "mixHash" : "0xfe1d0438b8e4636e39f1c349202c078f93d3310adac367b5781dbd1bd1b24ad4",
-                    "nonce" : "0x80d7c85aeee8cda5",
+                    "hash" : "0xba8123beb791d3c58aa1a5e2c21044c5e87990c377fb5f140c16da76d2857e52",
+                    "mixHash" : "0xd9124a8a6c05494457b11d2a1ef5bcffdde9dc570d2aa1eb69633c537a5b8390",
+                    "nonce" : "0x112c1787fb118023",
                     "number" : "0x01",
                     "parentHash" : "0x4819c44c75c3dcaa32d54c056e613da983bd8b86001ad01d0d97d9c0ca0703a9",
-                    "receiptTrie" : "0x667733204067902fa0a97ad2255b81d9c992416f45a2bb4ff5ae62566ce841a0",
-                    "stateRoot" : "0xad1a02ff92470ea61eca52f955397823d9f8da21d2e403634e632b056468adbc",
+                    "receiptTrie" : "0xea5612179b7b4a1f92bf7fc46c363bfe9555bf38b5b90fcb10d6815123883474",
+                    "stateRoot" : "0x79242497e4b8bf3e9859b9d07efb959336f6834dcf36a9bf2b6d6ead5864f64b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a04819c44c75c3dcaa32d54c056e613da983bd8b86001ad01d0d97d9c0ca0703a9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad1a02ff92470ea61eca52f955397823d9f8da21d2e403634e632b056468adbca06411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6fa0667733204067902fa0a97ad2255b81d9c992416f45a2bb4ff5ae62566ce841a0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f6188203e880a0fe1d0438b8e4636e39f1c349202c078f93d3310adac367b5781dbd1bd1b24ad48880d7c85aeee8cda5f861f85f800182f61894a00000000000000000000000000000000000000080801ca0246a61332db8981ed5eb513096f2e28373b7497fb8467c1e3af0f53f3aae0450a06d0f0e6c4c8db5b12b53089a0a80639de16cf32d1db2c3d20683e7dedb05934bc0",
+                "rlp" : "0xf9025ef901f7a04819c44c75c3dcaa32d54c056e613da983bd8b86001ad01d0d97d9c0ca0703a9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa079242497e4b8bf3e9859b9d07efb959336f6834dcf36a9bf2b6d6ead5864f64ba06411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6fa0ea5612179b7b4a1f92bf7fc46c363bfe9555bf38b5b90fcb10d6815123883474b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f6188203e880a0d9124a8a6c05494457b11d2a1ef5bcffdde9dc570d2aa1eb69633c537a5b839088112c1787fb118023f861f85f800182f61894a00000000000000000000000000000000000000080801ca0246a61332db8981ed5eb513096f2e28373b7497fb8467c1e3af0f53f3aae0450a06d0f0e6c4c8db5b12b53089a0a80639de16cf32d1db2c3d20683e7dedb05934bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -181,9 +188,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d9d706af5a8dae2ee0a8cbf1ed5f851b483ea075847e28fe03420497778ce14a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x40ae52cc65269067b33f95c2c97d911e71504cbb49d320915261324d42046b0d",
-        "network" : "EIP158",
+        "lastblockhash" : "0xba8123beb791d3c58aa1a5e2c21044c5e87990c377fb5f140c16da76d2857e52",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f618",
                 "code" : "",
@@ -237,10 +251,10 @@
             }
         }
     },
-    "RevertPrefoundEmptyCallOOG_d0g0v0_Frontier" : {
+    "RevertPrefoundEmptyCallOOG_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/stRevertTest/RevertPrefoundEmptyCallOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -252,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf618",
-                    "hash" : "0xfd29e8274c9d12d12cf05648d0e4533efef10b546a8ec156f4823b4745137be7",
-                    "mixHash" : "0x6e0c6fcec0253acfa6551895d817faa4657624fe9c8691ce483aeef4f02d97fc",
-                    "nonce" : "0xf72936074c9cc762",
+                    "hash" : "0x6d807a2814b17fbaa3ab6909e47f45e449043b9867f559ce2afe2df956bdb23b",
+                    "mixHash" : "0x8e4edf75054cc6de8455d6cd6bf581790cfc57f2a8edfaf35af456aedf116821",
+                    "nonce" : "0xa1b4d439711e44ee",
                     "number" : "0x01",
                     "parentHash" : "0x4819c44c75c3dcaa32d54c056e613da983bd8b86001ad01d0d97d9c0ca0703a9",
                     "receiptTrie" : "0x667733204067902fa0a97ad2255b81d9c992416f45a2bb4ff5ae62566ce841a0",
@@ -263,7 +277,7 @@
                     "transactionsTrie" : "0x6411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a04819c44c75c3dcaa32d54c056e613da983bd8b86001ad01d0d97d9c0ca0703a9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad1a02ff92470ea61eca52f955397823d9f8da21d2e403634e632b056468adbca06411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6fa0667733204067902fa0a97ad2255b81d9c992416f45a2bb4ff5ae62566ce841a0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f6188203e880a06e0c6fcec0253acfa6551895d817faa4657624fe9c8691ce483aeef4f02d97fc88f72936074c9cc762f861f85f800182f61894a00000000000000000000000000000000000000080801ca0246a61332db8981ed5eb513096f2e28373b7497fb8467c1e3af0f53f3aae0450a06d0f0e6c4c8db5b12b53089a0a80639de16cf32d1db2c3d20683e7dedb05934bc0",
+                "rlp" : "0xf9025ef901f7a04819c44c75c3dcaa32d54c056e613da983bd8b86001ad01d0d97d9c0ca0703a9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad1a02ff92470ea61eca52f955397823d9f8da21d2e403634e632b056468adbca06411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6fa0667733204067902fa0a97ad2255b81d9c992416f45a2bb4ff5ae62566ce841a0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f6188203e880a08e4edf75054cc6de8455d6cd6bf581790cfc57f2a8edfaf35af456aedf11682188a1b4d439711e44eef861f85f800182f61894a00000000000000000000000000000000000000080801ca0246a61332db8981ed5eb513096f2e28373b7497fb8467c1e3af0f53f3aae0450a06d0f0e6c4c8db5b12b53089a0a80639de16cf32d1db2c3d20683e7dedb05934bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -300,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d9d706af5a8dae2ee0a8cbf1ed5f851b483ea075847e28fe03420497778ce14a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfd29e8274c9d12d12cf05648d0e4533efef10b546a8ec156f4823b4745137be7",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6d807a2814b17fbaa3ab6909e47f45e449043b9867f559ce2afe2df956bdb23b",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f618",
@@ -356,10 +370,10 @@
             }
         }
     },
-    "RevertPrefoundEmptyCallOOG_d0g0v0_Homestead" : {
+    "RevertPrefoundEmptyCallOOG_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/stRevertTest/RevertPrefoundEmptyCallOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -371,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf618",
-                    "hash" : "0xe83b4b79309bc140b720f753ecd562da53ab7018c191e68f2ff35e164b5686f9",
-                    "mixHash" : "0x684bf0c8a73fd5d80358216f256c48fec37aa7326d077a51817eecd70a9d013f",
-                    "nonce" : "0x660e45bfebb9bd71",
+                    "hash" : "0x6c5c327a57fbd0b0a7d28c1ba822e58e8de6278f057d6bd0ca940c77698d81dc",
+                    "mixHash" : "0xb8a211fc5ac55ad3ac29b98bffb33163ddaed54a2e6fd3e517f44bb0419315ba",
+                    "nonce" : "0x4a74131a9b14187a",
                     "number" : "0x01",
                     "parentHash" : "0x4819c44c75c3dcaa32d54c056e613da983bd8b86001ad01d0d97d9c0ca0703a9",
                     "receiptTrie" : "0x667733204067902fa0a97ad2255b81d9c992416f45a2bb4ff5ae62566ce841a0",
@@ -382,7 +396,7 @@
                     "transactionsTrie" : "0x6411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a04819c44c75c3dcaa32d54c056e613da983bd8b86001ad01d0d97d9c0ca0703a9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad1a02ff92470ea61eca52f955397823d9f8da21d2e403634e632b056468adbca06411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6fa0667733204067902fa0a97ad2255b81d9c992416f45a2bb4ff5ae62566ce841a0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f6188203e880a0684bf0c8a73fd5d80358216f256c48fec37aa7326d077a51817eecd70a9d013f88660e45bfebb9bd71f861f85f800182f61894a00000000000000000000000000000000000000080801ca0246a61332db8981ed5eb513096f2e28373b7497fb8467c1e3af0f53f3aae0450a06d0f0e6c4c8db5b12b53089a0a80639de16cf32d1db2c3d20683e7dedb05934bc0",
+                "rlp" : "0xf9025ef901f7a04819c44c75c3dcaa32d54c056e613da983bd8b86001ad01d0d97d9c0ca0703a9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad1a02ff92470ea61eca52f955397823d9f8da21d2e403634e632b056468adbca06411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6fa0667733204067902fa0a97ad2255b81d9c992416f45a2bb4ff5ae62566ce841a0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f6188203e880a0b8a211fc5ac55ad3ac29b98bffb33163ddaed54a2e6fd3e517f44bb0419315ba884a74131a9b14187af861f85f800182f61894a00000000000000000000000000000000000000080801ca0246a61332db8981ed5eb513096f2e28373b7497fb8467c1e3af0f53f3aae0450a06d0f0e6c4c8db5b12b53089a0a80639de16cf32d1db2c3d20683e7dedb05934bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -419,8 +433,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d9d706af5a8dae2ee0a8cbf1ed5f851b483ea075847e28fe03420497778ce14a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe83b4b79309bc140b720f753ecd562da53ab7018c191e68f2ff35e164b5686f9",
-        "network" : "Homestead",
+        "lastblockhash" : "0x6c5c327a57fbd0b0a7d28c1ba822e58e8de6278f057d6bd0ca940c77698d81dc",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f618",
@@ -475,10 +489,10 @@
             }
         }
     },
-    "RevertPrefoundEmptyCallOOG_d0g0v0_Metropolis" : {
+    "RevertPrefoundEmptyCallOOG_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/stRevertTest/RevertPrefoundEmptyCallOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -490,18 +504,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf618",
-                    "hash" : "0x600a7f4468122b773502f230faf7995831f9d68aa9cc0890c94f44c45e79b7f2",
-                    "mixHash" : "0xf03799173692025259df7f2871ab83fb8cf3defe62122c1339647f952d152782",
-                    "nonce" : "0x485c1d2e37f0ca9d",
+                    "hash" : "0x23b39e2fff4fd82c1aa0ed51341e92e9a74b00a034272ba0fe598d6977db6db2",
+                    "mixHash" : "0x1b687bb620c0e957a13e01694545453f92479ea02ec36adb806af40def70658e",
+                    "nonce" : "0x6f18cdfeddb28d90",
                     "number" : "0x01",
                     "parentHash" : "0x4819c44c75c3dcaa32d54c056e613da983bd8b86001ad01d0d97d9c0ca0703a9",
-                    "receiptTrie" : "0xea5612179b7b4a1f92bf7fc46c363bfe9555bf38b5b90fcb10d6815123883474",
-                    "stateRoot" : "0x79242497e4b8bf3e9859b9d07efb959336f6834dcf36a9bf2b6d6ead5864f64b",
+                    "receiptTrie" : "0x667733204067902fa0a97ad2255b81d9c992416f45a2bb4ff5ae62566ce841a0",
+                    "stateRoot" : "0xad1a02ff92470ea61eca52f955397823d9f8da21d2e403634e632b056468adbc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a04819c44c75c3dcaa32d54c056e613da983bd8b86001ad01d0d97d9c0ca0703a9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa079242497e4b8bf3e9859b9d07efb959336f6834dcf36a9bf2b6d6ead5864f64ba06411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6fa0ea5612179b7b4a1f92bf7fc46c363bfe9555bf38b5b90fcb10d6815123883474b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f6188203e880a0f03799173692025259df7f2871ab83fb8cf3defe62122c1339647f952d15278288485c1d2e37f0ca9df861f85f800182f61894a00000000000000000000000000000000000000080801ca0246a61332db8981ed5eb513096f2e28373b7497fb8467c1e3af0f53f3aae0450a06d0f0e6c4c8db5b12b53089a0a80639de16cf32d1db2c3d20683e7dedb05934bc0",
+                "rlp" : "0xf9025ef901f7a04819c44c75c3dcaa32d54c056e613da983bd8b86001ad01d0d97d9c0ca0703a9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad1a02ff92470ea61eca52f955397823d9f8da21d2e403634e632b056468adbca06411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6fa0667733204067902fa0a97ad2255b81d9c992416f45a2bb4ff5ae62566ce841a0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f6188203e880a01b687bb620c0e957a13e01694545453f92479ea02ec36adb806af40def70658e886f18cdfeddb28d90f861f85f800182f61894a00000000000000000000000000000000000000080801ca0246a61332db8981ed5eb513096f2e28373b7497fb8467c1e3af0f53f3aae0450a06d0f0e6c4c8db5b12b53089a0a80639de16cf32d1db2c3d20683e7dedb05934bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -538,16 +552,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d9d706af5a8dae2ee0a8cbf1ed5f851b483ea075847e28fe03420497778ce14a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x600a7f4468122b773502f230faf7995831f9d68aa9cc0890c94f44c45e79b7f2",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x23b39e2fff4fd82c1aa0ed51341e92e9a74b00a034272ba0fe598d6977db6db2",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f618",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60206000602060006000737db299e0885c85039f56fa504a13dd8ce8a56aa761c350f1600055600c600155600c600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a419e8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60206000602060006000737db299e0885c85039f56fa504a13dd8ce8a56aa761c350f1600055600c600155600c600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertPrefoundEmptyCallOOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertPrefoundEmptyCallOOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf618",
+                    "hash" : "0x14fa7c8968387587b44d62ff0c4f4af7403fd2f3d76bd4f75ffb79ba2e856061",
+                    "mixHash" : "0xfa10839114685a1dc75b763c73265477072c5ff1073f35be64085bde23d4a5ea",
+                    "nonce" : "0x5dac4dd8d7a1ea4c",
+                    "number" : "0x01",
+                    "parentHash" : "0x4819c44c75c3dcaa32d54c056e613da983bd8b86001ad01d0d97d9c0ca0703a9",
+                    "receiptTrie" : "0x667733204067902fa0a97ad2255b81d9c992416f45a2bb4ff5ae62566ce841a0",
+                    "stateRoot" : "0xad1a02ff92470ea61eca52f955397823d9f8da21d2e403634e632b056468adbc",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a04819c44c75c3dcaa32d54c056e613da983bd8b86001ad01d0d97d9c0ca0703a9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad1a02ff92470ea61eca52f955397823d9f8da21d2e403634e632b056468adbca06411da215479c28fa2d2792ee02e84dda72b12d64fbd9534e5439fa772ce6f6fa0667733204067902fa0a97ad2255b81d9c992416f45a2bb4ff5ae62566ce841a0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f6188203e880a0fa10839114685a1dc75b763c73265477072c5ff1073f35be64085bde23d4a5ea885dac4dd8d7a1ea4cf861f85f800182f61894a00000000000000000000000000000000000000080801ca0246a61332db8981ed5eb513096f2e28373b7497fb8467c1e3af0f53f3aae0450a06d0f0e6c4c8db5b12b53089a0a80639de16cf32d1db2c3d20683e7dedb05934bc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0xf618",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x246a61332db8981ed5eb513096f2e28373b7497fb8467c1e3af0f53f3aae0450",
+                        "s" : "0x6d0f0e6c4c8db5b12b53089a0a80639de16cf32d1db2c3d20683e7dedb05934b",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x4819c44c75c3dcaa32d54c056e613da983bd8b86001ad01d0d97d9c0ca0703a9",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7d9d706af5a8dae2ee0a8cbf1ed5f851b483ea075847e28fe03420497778ce14",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d9d706af5a8dae2ee0a8cbf1ed5f851b483ea075847e28fe03420497778ce14a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x14fa7c8968387587b44d62ff0c4f4af7403fd2f3d76bd4f75ffb79ba2e856061",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f618",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCall_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCall_d0g0v0.json
index ebb193568..351b0f162 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCall_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCall_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertPrefoundEmptyCall_d0g0v0_EIP150" : {
+    "RevertPrefoundEmptyCall_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/stRevertTest/RevertPrefoundEmptyCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf125",
-                    "hash" : "0x202a439ec603ff5d286fe9fbf3d2a5395469c9b4d32b6953d4ba6a41dda9cc2c",
-                    "mixHash" : "0x0b321362877e6ae5e6329f426f687c257b2063dfe863565538c48cdc8c3e6cde",
-                    "nonce" : "0x3e8f7e5d8e2210b1",
+                    "hash" : "0xeb40fcdef0459178f367c53a67901916ef059f66935deb0ddfa7329192e1ce26",
+                    "mixHash" : "0x98accddf989c2564779a22f01904803707eafc0ea2d15b68b7f9a4c7f0235e69",
+                    "nonce" : "0x0149b2afa6b2f602",
                     "number" : "0x01",
                     "parentHash" : "0x9d6a9339ffaecbbd85d6b3f69ac85036c0db1e8f8f5644c4c8bef47dcc432f43",
-                    "receiptTrie" : "0xe7c82a8f07956ed9d5bfac3c3771736c69263c9b89833f83de0f6ae4ced71e7f",
-                    "stateRoot" : "0x014ef5ea409883573ec4c16d677c5623ac92f6c7f768d71f14e5f59bee835e70",
+                    "receiptTrie" : "0x86d362c081799ce8243ede2d228ed8381feeced7c6593bf21b46ccd1f85c5bad",
+                    "stateRoot" : "0x19fb919bf088076df5e604344f4df65d0b234f13306a11ab5054d9b6b931171f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a09d6a9339ffaecbbd85d6b3f69ac85036c0db1e8f8f5644c4c8bef47dcc432f43a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0014ef5ea409883573ec4c16d677c5623ac92f6c7f768d71f14e5f59bee835e70a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0e7c82a8f07956ed9d5bfac3c3771736c69263c9b89833f83de0f6ae4ced71e7fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1258203e880a00b321362877e6ae5e6329f426f687c257b2063dfe863565538c48cdc8c3e6cde883e8f7e5d8e2210b1f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
+                "rlp" : "0xf9025ff901f7a09d6a9339ffaecbbd85d6b3f69ac85036c0db1e8f8f5644c4c8bef47dcc432f43a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa019fb919bf088076df5e604344f4df65d0b234f13306a11ab5054d9b6b931171fa0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a086d362c081799ce8243ede2d228ed8381feeced7c6593bf21b46ccd1f85c5badb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1258203e880a098accddf989c2564779a22f01904803707eafc0ea2d15b68b7f9a4c7f0235e69880149b2afa6b2f602f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,18 +62,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ced99f8b5c91a2b560a3475bf84fe478cc8eeeb527d70a37b3e1cc4ac4717d1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x202a439ec603ff5d286fe9fbf3d2a5395469c9b4d32b6953d4ba6a41dda9cc2c",
-        "network" : "EIP150",
+        "lastblockhash" : "0xeb40fcdef0459178f367c53a67901916ef059f66935deb0ddfa7329192e1ce26",
+        "network" : "Byzantium",
         "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f125",
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f125",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -120,10 +120,10 @@
             }
         }
     },
-    "RevertPrefoundEmptyCall_d0g0v0_EIP158" : {
+    "RevertPrefoundEmptyCall_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/stRevertTest/RevertPrefoundEmptyCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,18 +135,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf125",
-                    "hash" : "0xa8660088b1c460304327962dea8ecf78e6afcc03e7829c0f837fee5bd269ad28",
-                    "mixHash" : "0x20ff0a76fce3c30df2f592e99237bb883b325e285d43548b40fa6ff40eb813fd",
-                    "nonce" : "0x131d564661765758",
+                    "hash" : "0x4c33c8c054940132dae15ef48432dc19c27fdc23f057e3c14239c76101c029ea",
+                    "mixHash" : "0x0194cb3ca5c8b7ef9ebf21903a4c2d4c0c5ef7865c44ae6e414fd87654fdacc8",
+                    "nonce" : "0x5bfe2b059703da94",
                     "number" : "0x01",
                     "parentHash" : "0x9d6a9339ffaecbbd85d6b3f69ac85036c0db1e8f8f5644c4c8bef47dcc432f43",
-                    "receiptTrie" : "0xce874977b3fc6611d39ac048dd4b33fc042f4849335da0fc2505ae893b586ff2",
-                    "stateRoot" : "0x6f37abbabb932eb9f97af1f9c5307a8024e59fec1d279821b695a25a97a5a665",
+                    "receiptTrie" : "0x86d362c081799ce8243ede2d228ed8381feeced7c6593bf21b46ccd1f85c5bad",
+                    "stateRoot" : "0x19fb919bf088076df5e604344f4df65d0b234f13306a11ab5054d9b6b931171f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a09d6a9339ffaecbbd85d6b3f69ac85036c0db1e8f8f5644c4c8bef47dcc432f43a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06f37abbabb932eb9f97af1f9c5307a8024e59fec1d279821b695a25a97a5a665a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0ce874977b3fc6611d39ac048dd4b33fc042f4849335da0fc2505ae893b586ff2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1258203e880a020ff0a76fce3c30df2f592e99237bb883b325e285d43548b40fa6ff40eb813fd88131d564661765758f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
+                "rlp" : "0xf9025ff901f7a09d6a9339ffaecbbd85d6b3f69ac85036c0db1e8f8f5644c4c8bef47dcc432f43a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa019fb919bf088076df5e604344f4df65d0b234f13306a11ab5054d9b6b931171fa0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a086d362c081799ce8243ede2d228ed8381feeced7c6593bf21b46ccd1f85c5badb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1258203e880a00194cb3ca5c8b7ef9ebf21903a4c2d4c0c5ef7865c44ae6e414fd87654fdacc8885bfe2b059703da94f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,9 +183,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ced99f8b5c91a2b560a3475bf84fe478cc8eeeb527d70a37b3e1cc4ac4717d1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa8660088b1c460304327962dea8ecf78e6afcc03e7829c0f837fee5bd269ad28",
-        "network" : "EIP158",
+        "lastblockhash" : "0x4c33c8c054940132dae15ef48432dc19c27fdc23f057e3c14239c76101c029ea",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4f125",
                 "code" : "",
@@ -234,10 +241,10 @@
             }
         }
     },
-    "RevertPrefoundEmptyCall_d0g0v0_Frontier" : {
+    "RevertPrefoundEmptyCall_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/stRevertTest/RevertPrefoundEmptyCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -248,19 +255,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xee91",
-                    "hash" : "0xde21b9fc11a55d0106d9c9d933403e1a16640df06d8a4bbd272095ef627c4804",
-                    "mixHash" : "0xbc74f5f073a160456ad04afb54a97692fd1b2b01bd1ed00b21c2f75a4d610fe8",
-                    "nonce" : "0xd266ab476a5ecf43",
+                    "gasUsed" : "0xf125",
+                    "hash" : "0xe2da580d606b59ee6c98bda1744115517317e34dd53ac5d29472c8adf7d6f58c",
+                    "mixHash" : "0x4fabee7d21c3e595c0b8fd23369e2f47aeedd171b93936b77db9461c1c3b3970",
+                    "nonce" : "0xb09612407fbbd780",
                     "number" : "0x01",
                     "parentHash" : "0x9d6a9339ffaecbbd85d6b3f69ac85036c0db1e8f8f5644c4c8bef47dcc432f43",
-                    "receiptTrie" : "0xabbc1936c149f5e6a5a2c1e1baacf76bc2e7e366b0d70818ac4b070665261082",
-                    "stateRoot" : "0x583ac356e52f272a8e530abcd2c73d7a197a69bb91e3820cc234e03b316ccb3c",
+                    "receiptTrie" : "0xe7c82a8f07956ed9d5bfac3c3771736c69263c9b89833f83de0f6ae4ced71e7f",
+                    "stateRoot" : "0x014ef5ea409883573ec4c16d677c5623ac92f6c7f768d71f14e5f59bee835e70",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a09d6a9339ffaecbbd85d6b3f69ac85036c0db1e8f8f5644c4c8bef47dcc432f43a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0583ac356e52f272a8e530abcd2c73d7a197a69bb91e3820cc234e03b316ccb3ca0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0abbc1936c149f5e6a5a2c1e1baacf76bc2e7e366b0d70818ac4b070665261082b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee918203e880a0bc74f5f073a160456ad04afb54a97692fd1b2b01bd1ed00b21c2f75a4d610fe888d266ab476a5ecf43f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
+                "rlp" : "0xf9025ff901f7a09d6a9339ffaecbbd85d6b3f69ac85036c0db1e8f8f5644c4c8bef47dcc432f43a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0014ef5ea409883573ec4c16d677c5623ac92f6c7f768d71f14e5f59bee835e70a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0e7c82a8f07956ed9d5bfac3c3771736c69263c9b89833f83de0f6ae4ced71e7fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1258203e880a04fabee7d21c3e595c0b8fd23369e2f47aeedd171b93936b77db9461c1c3b397088b09612407fbbd780f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -297,11 +304,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ced99f8b5c91a2b560a3475bf84fe478cc8eeeb527d70a37b3e1cc4ac4717d1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xde21b9fc11a55d0106d9c9d933403e1a16640df06d8a4bbd272095ef627c4804",
-        "network" : "Frontier",
+        "lastblockhash" : "0xe2da580d606b59ee6c98bda1744115517317e34dd53ac5d29472c8adf7d6f58c",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4ee91",
+                "balance" : "0x4563918244f4f125",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -324,7 +331,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a4216f",
+                "balance" : "0xe8d4a41edb",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -355,10 +362,124 @@
             }
         }
     },
-    "RevertPrefoundEmptyCall_d0g0v0_Homestead" : {
+    "RevertPrefoundEmptyCall_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/stRevertTest/RevertPrefoundEmptyCall_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf125",
+                    "hash" : "0x59d8dada1555ab9b75d33cadfa9465e61505da65b577cf87fd26f15eb525ac86",
+                    "mixHash" : "0x1dfd4519d0fdf473c1e62140a24c169eb0cd4e9047ed08bb22e07f8ed1194543",
+                    "nonce" : "0xc32d4c3e50634d55",
+                    "number" : "0x01",
+                    "parentHash" : "0x9d6a9339ffaecbbd85d6b3f69ac85036c0db1e8f8f5644c4c8bef47dcc432f43",
+                    "receiptTrie" : "0xce874977b3fc6611d39ac048dd4b33fc042f4849335da0fc2505ae893b586ff2",
+                    "stateRoot" : "0x6f37abbabb932eb9f97af1f9c5307a8024e59fec1d279821b695a25a97a5a665",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xbe92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a09d6a9339ffaecbbd85d6b3f69ac85036c0db1e8f8f5644c4c8bef47dcc432f43a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06f37abbabb932eb9f97af1f9c5307a8024e59fec1d279821b695a25a97a5a665a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0ce874977b3fc6611d39ac048dd4b33fc042f4849335da0fc2505ae893b586ff2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1258203e880a01dfd4519d0fdf473c1e62140a24c169eb0cd4e9047ed08bb22e07f8ed119454388c32d4c3e50634d55f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x016f30",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfd",
+                        "s" : "0x6abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9d6a9339ffaecbbd85d6b3f69ac85036c0db1e8f8f5644c4c8bef47dcc432f43",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5ced99f8b5c91a2b560a3475bf84fe478cc8eeeb527d70a37b3e1cc4ac4717d1",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ced99f8b5c91a2b560a3475bf84fe478cc8eeeb527d70a37b3e1cc4ac4717d1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x59d8dada1555ab9b75d33cadfa9465e61505da65b577cf87fd26f15eb525ac86",
+        "network" : "EIP158",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f125",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60206000602060006000737db299e0885c85039f56fa504a13dd8ce8a56aa761c350f1600055600c600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x0c"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a41edb",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60206000602060006000737db299e0885c85039f56fa504a13dd8ce8a56aa761c350f1600055600c600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertPrefoundEmptyCall_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertPrefoundEmptyCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -370,9 +491,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xee91",
-                    "hash" : "0x1e5a47144f4a80c3792d34f9ae00cdee01581db25afae824ca85048569970358",
-                    "mixHash" : "0xdbd75edc20f817f813e144449e9d0e017b7eaf2ddb36924e77fea35c2eba339e",
-                    "nonce" : "0x742b8a3c408fd109",
+                    "hash" : "0xc11203a2bb1e521429fbe815278a821745d30e85b7af7ed93f9019a1e4f395c8",
+                    "mixHash" : "0xd78bf5f7a77fa357c884f9e7f19d73877b80ac4728ba768ba96871a1e497d65c",
+                    "nonce" : "0x62965558b8ee5629",
                     "number" : "0x01",
                     "parentHash" : "0x9d6a9339ffaecbbd85d6b3f69ac85036c0db1e8f8f5644c4c8bef47dcc432f43",
                     "receiptTrie" : "0xabbc1936c149f5e6a5a2c1e1baacf76bc2e7e366b0d70818ac4b070665261082",
@@ -381,7 +502,7 @@
                     "transactionsTrie" : "0xbe92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a09d6a9339ffaecbbd85d6b3f69ac85036c0db1e8f8f5644c4c8bef47dcc432f43a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0583ac356e52f272a8e530abcd2c73d7a197a69bb91e3820cc234e03b316ccb3ca0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0abbc1936c149f5e6a5a2c1e1baacf76bc2e7e366b0d70818ac4b070665261082b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee918203e880a0dbd75edc20f817f813e144449e9d0e017b7eaf2ddb36924e77fea35c2eba339e88742b8a3c408fd109f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
+                "rlp" : "0xf9025ff901f7a09d6a9339ffaecbbd85d6b3f69ac85036c0db1e8f8f5644c4c8bef47dcc432f43a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0583ac356e52f272a8e530abcd2c73d7a197a69bb91e3820cc234e03b316ccb3ca0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0abbc1936c149f5e6a5a2c1e1baacf76bc2e7e366b0d70818ac4b070665261082b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee918203e880a0d78bf5f7a77fa357c884f9e7f19d73877b80ac4728ba768ba96871a1e497d65c8862965558b8ee5629f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -418,8 +539,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ced99f8b5c91a2b560a3475bf84fe478cc8eeeb527d70a37b3e1cc4ac4717d1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1e5a47144f4a80c3792d34f9ae00cdee01581db25afae824ca85048569970358",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc11203a2bb1e521429fbe815278a821745d30e85b7af7ed93f9019a1e4f395c8",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4ee91",
@@ -476,10 +597,10 @@
             }
         }
     },
-    "RevertPrefoundEmptyCall_d0g0v0_Metropolis" : {
+    "RevertPrefoundEmptyCall_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertPrefoundEmptyCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -490,19 +611,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf125",
-                    "hash" : "0x8b5b24706a4dcb41fde222886adeac9ceb80ce5e91c3f9431dec45160bbad760",
-                    "mixHash" : "0xeefbcff4086455f530851850c902f7ad7dfb3dc075b2a0edb312513fd6f6b894",
-                    "nonce" : "0xb973b03afb12af5f",
+                    "gasUsed" : "0xee91",
+                    "hash" : "0xdeee11ccb4308f07cc28d945da1365dc347469213a0396701f1d3dfa34312cf7",
+                    "mixHash" : "0xd830c3b9567968ed247337fc5bd06f211bdf0ee46feb1d3342c61cb2c3445d36",
+                    "nonce" : "0x50e8f390f13edd5c",
                     "number" : "0x01",
                     "parentHash" : "0x9d6a9339ffaecbbd85d6b3f69ac85036c0db1e8f8f5644c4c8bef47dcc432f43",
-                    "receiptTrie" : "0x86d362c081799ce8243ede2d228ed8381feeced7c6593bf21b46ccd1f85c5bad",
-                    "stateRoot" : "0x19fb919bf088076df5e604344f4df65d0b234f13306a11ab5054d9b6b931171f",
+                    "receiptTrie" : "0xabbc1936c149f5e6a5a2c1e1baacf76bc2e7e366b0d70818ac4b070665261082",
+                    "stateRoot" : "0x583ac356e52f272a8e530abcd2c73d7a197a69bb91e3820cc234e03b316ccb3c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a09d6a9339ffaecbbd85d6b3f69ac85036c0db1e8f8f5644c4c8bef47dcc432f43a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa019fb919bf088076df5e604344f4df65d0b234f13306a11ab5054d9b6b931171fa0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a086d362c081799ce8243ede2d228ed8381feeced7c6593bf21b46ccd1f85c5badb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1258203e880a0eefbcff4086455f530851850c902f7ad7dfb3dc075b2a0edb312513fd6f6b89488b973b03afb12af5ff862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
+                "rlp" : "0xf9025ff901f7a09d6a9339ffaecbbd85d6b3f69ac85036c0db1e8f8f5644c4c8bef47dcc432f43a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0583ac356e52f272a8e530abcd2c73d7a197a69bb91e3820cc234e03b316ccb3ca0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0abbc1936c149f5e6a5a2c1e1baacf76bc2e7e366b0d70818ac4b070665261082b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ee918203e880a0d830c3b9567968ed247337fc5bd06f211bdf0ee46feb1d3342c61cb2c3445d368850e8f390f13edd5cf862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -539,18 +660,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ced99f8b5c91a2b560a3475bf84fe478cc8eeeb527d70a37b3e1cc4ac4717d1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8b5b24706a4dcb41fde222886adeac9ceb80ce5e91c3f9431dec45160bbad760",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xdeee11ccb4308f07cc28d945da1365dc347469213a0396701f1d3dfa34312cf7",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ee91",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f125",
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+                "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -566,7 +687,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a41edb",
+                "balance" : "0xe8d4a4216f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundEmptyOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundEmptyOOG_d0g0v0.json
index 40d93abcb..e96734cd9 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundEmptyOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundEmptyOOG_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertPrefoundEmptyOOG_d0g0v0_EIP150" : {
+    "RevertPrefoundEmptyOOG_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/stRevertTest/RevertPrefoundEmptyOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b48",
-                    "hash" : "0x01a4d03349f4a46bf78fcbda8fde594a34593311db044f43fa686f14322574e6",
-                    "mixHash" : "0xbde496b92a8e3f919995f427365620ac31c4d9b25d8e0cc45485d433e96ecdc6",
-                    "nonce" : "0x21c2b1a3aebe6cc5",
+                    "hash" : "0xaefc7cbba86acb9934ef1b757fc2bbaf41d92c705e2248a6e09682c04d30200f",
+                    "mixHash" : "0x9c86011c5cb4f33c1dadeb94ed3dc548b8d2e8bc07891bc75e447fa2753b30bc",
+                    "nonce" : "0x529b799f91e73d91",
                     "number" : "0x01",
                     "parentHash" : "0xc3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2fab",
-                    "receiptTrie" : "0x8295e8eda5c1ebb0c2b21a8a246b552dc0edc8387086eafde9bf18bb8cf582ee",
-                    "stateRoot" : "0xf03513d2e5333ae45cbad682d325fe32235d1dec78d605201967e013b8881b13",
+                    "receiptTrie" : "0x982f8a0eedb427918fbb2f3db7c5a72451437d3e482f851b69047ab57d90616d",
+                    "stateRoot" : "0x6f805aa2747d2c012d2313a93c4db0dc0047b9b73e78f9e10f786227093acc96",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2faba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f03513d2e5333ae45cbad682d325fe32235d1dec78d605201967e013b8881b13a04169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1a08295e8eda5c1ebb0c2b21a8a246b552dc0edc8387086eafde9bf18bb8cf582eeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b488203e880a0bde496b92a8e3f919995f427365620ac31c4d9b25d8e0cc45485d433e96ecdc68821c2b1a3aebe6cc5f862f860800183016b4894a00000000000000000000000000000000000000080801ca0d33edc94825b2014a3f433643597c12717eb1c31a002b106bfd36f7c5f3585d4a057cf76e2958fa2458f2f7968732544f5ead49e6e82d493a1d08f44f4c85e7cabc0",
+                "rlp" : "0xf90260f901f8a0c3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2faba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06f805aa2747d2c012d2313a93c4db0dc0047b9b73e78f9e10f786227093acc96a04169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1a0982f8a0eedb427918fbb2f3db7c5a72451437d3e482f851b69047ab57d90616db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b488203e880a09c86011c5cb4f33c1dadeb94ed3dc548b8d2e8bc07891bc75e447fa2753b30bc88529b799f91e73d91f862f860800183016b4894a00000000000000000000000000000000000000080801ca0d33edc94825b2014a3f433643597c12717eb1c31a002b106bfd36f7c5f3585d4a057cf76e2958fa2458f2f7968732544f5ead49e6e82d493a1d08f44f4c85e7cabc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095c46f6045a235209eaba53bb67e4004fe74ecc37838dac7941e26281807c7dda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x01a4d03349f4a46bf78fcbda8fde594a34593311db044f43fa686f14322574e6",
-        "network" : "EIP150",
+        "lastblockhash" : "0xaefc7cbba86acb9934ef1b757fc2bbaf41d92c705e2248a6e09682c04d30200f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b48",
                 "code" : "",
@@ -118,10 +125,10 @@
             }
         }
     },
-    "RevertPrefoundEmptyOOG_d0g0v0_EIP158" : {
+    "RevertPrefoundEmptyOOG_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/stRevertTest/RevertPrefoundEmptyOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -133,18 +140,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b48",
-                    "hash" : "0xfc1a51695f0e6f129edc80f6ed60a05f06f0bee84f6a3271892c96ec07b2eddc",
-                    "mixHash" : "0xd74e1c42d4b6105edbe47079abf1717b030df5fe3d073d0e483002e77f553402",
-                    "nonce" : "0x58d543e015e99ba7",
+                    "hash" : "0x5d79e658e4f4be54712281ac3b2ba4fdc2a85b7efaa33a40ea6d9a4c4f4807f7",
+                    "mixHash" : "0x5bcc401942912eec0b749b266f53fe4e1a2b689598b160ffb3f297fe61cf1f7b",
+                    "nonce" : "0xcb201e689a0bfb42",
                     "number" : "0x01",
                     "parentHash" : "0xc3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2fab",
-                    "receiptTrie" : "0x8295e8eda5c1ebb0c2b21a8a246b552dc0edc8387086eafde9bf18bb8cf582ee",
-                    "stateRoot" : "0xf03513d2e5333ae45cbad682d325fe32235d1dec78d605201967e013b8881b13",
+                    "receiptTrie" : "0x982f8a0eedb427918fbb2f3db7c5a72451437d3e482f851b69047ab57d90616d",
+                    "stateRoot" : "0x6f805aa2747d2c012d2313a93c4db0dc0047b9b73e78f9e10f786227093acc96",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2faba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f03513d2e5333ae45cbad682d325fe32235d1dec78d605201967e013b8881b13a04169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1a08295e8eda5c1ebb0c2b21a8a246b552dc0edc8387086eafde9bf18bb8cf582eeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b488203e880a0d74e1c42d4b6105edbe47079abf1717b030df5fe3d073d0e483002e77f5534028858d543e015e99ba7f862f860800183016b4894a00000000000000000000000000000000000000080801ca0d33edc94825b2014a3f433643597c12717eb1c31a002b106bfd36f7c5f3585d4a057cf76e2958fa2458f2f7968732544f5ead49e6e82d493a1d08f44f4c85e7cabc0",
+                "rlp" : "0xf90260f901f8a0c3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2faba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06f805aa2747d2c012d2313a93c4db0dc0047b9b73e78f9e10f786227093acc96a04169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1a0982f8a0eedb427918fbb2f3db7c5a72451437d3e482f851b69047ab57d90616db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b488203e880a05bcc401942912eec0b749b266f53fe4e1a2b689598b160ffb3f297fe61cf1f7b88cb201e689a0bfb42f862f860800183016b4894a00000000000000000000000000000000000000080801ca0d33edc94825b2014a3f433643597c12717eb1c31a002b106bfd36f7c5f3585d4a057cf76e2958fa2458f2f7968732544f5ead49e6e82d493a1d08f44f4c85e7cabc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -181,9 +188,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095c46f6045a235209eaba53bb67e4004fe74ecc37838dac7941e26281807c7dda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfc1a51695f0e6f129edc80f6ed60a05f06f0bee84f6a3271892c96ec07b2eddc",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5d79e658e4f4be54712281ac3b2ba4fdc2a85b7efaa33a40ea6d9a4c4f4807f7",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b48",
                 "code" : "",
@@ -237,10 +251,10 @@
             }
         }
     },
-    "RevertPrefoundEmptyOOG_d0g0v0_Frontier" : {
+    "RevertPrefoundEmptyOOG_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/stRevertTest/RevertPrefoundEmptyOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -252,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b48",
-                    "hash" : "0xde0453843ffc7423c7d06b7794fd9bcb7b9f34d457a88c9df660fac0e1f4d5e2",
-                    "mixHash" : "0x5c98117ceb585be69ca335448fd84107652e5e84d7f645de7d7d8978aaa5c04a",
-                    "nonce" : "0xfb1d34cc6db0f3df",
+                    "hash" : "0xe5bb5fb0cd2b64f7780e22396c83432c90446ebc4325ff3f56fd7281d92cc357",
+                    "mixHash" : "0xa24097eb66bb72bdfa3985b26ea5be02788fed98a60b0df4af3e6c1a61ce2de9",
+                    "nonce" : "0x14562781757e2617",
                     "number" : "0x01",
                     "parentHash" : "0xc3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2fab",
                     "receiptTrie" : "0x8295e8eda5c1ebb0c2b21a8a246b552dc0edc8387086eafde9bf18bb8cf582ee",
@@ -263,7 +277,7 @@
                     "transactionsTrie" : "0x4169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2faba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f03513d2e5333ae45cbad682d325fe32235d1dec78d605201967e013b8881b13a04169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1a08295e8eda5c1ebb0c2b21a8a246b552dc0edc8387086eafde9bf18bb8cf582eeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b488203e880a05c98117ceb585be69ca335448fd84107652e5e84d7f645de7d7d8978aaa5c04a88fb1d34cc6db0f3dff862f860800183016b4894a00000000000000000000000000000000000000080801ca0d33edc94825b2014a3f433643597c12717eb1c31a002b106bfd36f7c5f3585d4a057cf76e2958fa2458f2f7968732544f5ead49e6e82d493a1d08f44f4c85e7cabc0",
+                "rlp" : "0xf90260f901f8a0c3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2faba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f03513d2e5333ae45cbad682d325fe32235d1dec78d605201967e013b8881b13a04169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1a08295e8eda5c1ebb0c2b21a8a246b552dc0edc8387086eafde9bf18bb8cf582eeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b488203e880a0a24097eb66bb72bdfa3985b26ea5be02788fed98a60b0df4af3e6c1a61ce2de98814562781757e2617f862f860800183016b4894a00000000000000000000000000000000000000080801ca0d33edc94825b2014a3f433643597c12717eb1c31a002b106bfd36f7c5f3585d4a057cf76e2958fa2458f2f7968732544f5ead49e6e82d493a1d08f44f4c85e7cabc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -300,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095c46f6045a235209eaba53bb67e4004fe74ecc37838dac7941e26281807c7dda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xde0453843ffc7423c7d06b7794fd9bcb7b9f34d457a88c9df660fac0e1f4d5e2",
-        "network" : "Frontier",
+        "lastblockhash" : "0xe5bb5fb0cd2b64f7780e22396c83432c90446ebc4325ff3f56fd7281d92cc357",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b48",
@@ -356,10 +370,10 @@
             }
         }
     },
-    "RevertPrefoundEmptyOOG_d0g0v0_Homestead" : {
+    "RevertPrefoundEmptyOOG_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/stRevertTest/RevertPrefoundEmptyOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -371,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b48",
-                    "hash" : "0xd33d0bca0689e812bbad1bf53cdb0ad053ee6975feaa9be3eae977d2d4af3ae6",
-                    "mixHash" : "0xc11349fc13ed670a8f7feeab7c9fb4b887a4ad1b9824a08122e3f175f6f2f29e",
-                    "nonce" : "0x75bb2a2468c8a072",
+                    "hash" : "0x9225e1461aaf01d5c80e733b6b808bb1463b59da332ef39dbc56740e84011ff7",
+                    "mixHash" : "0xdde5deaba82898c1c0c63d244e5a59e1f7b8d660a8c390e600d230075a015a45",
+                    "nonce" : "0xfa9d347d56bc2cb4",
                     "number" : "0x01",
                     "parentHash" : "0xc3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2fab",
                     "receiptTrie" : "0x8295e8eda5c1ebb0c2b21a8a246b552dc0edc8387086eafde9bf18bb8cf582ee",
@@ -382,7 +396,7 @@
                     "transactionsTrie" : "0x4169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2faba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f03513d2e5333ae45cbad682d325fe32235d1dec78d605201967e013b8881b13a04169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1a08295e8eda5c1ebb0c2b21a8a246b552dc0edc8387086eafde9bf18bb8cf582eeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b488203e880a0c11349fc13ed670a8f7feeab7c9fb4b887a4ad1b9824a08122e3f175f6f2f29e8875bb2a2468c8a072f862f860800183016b4894a00000000000000000000000000000000000000080801ca0d33edc94825b2014a3f433643597c12717eb1c31a002b106bfd36f7c5f3585d4a057cf76e2958fa2458f2f7968732544f5ead49e6e82d493a1d08f44f4c85e7cabc0",
+                "rlp" : "0xf90260f901f8a0c3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2faba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f03513d2e5333ae45cbad682d325fe32235d1dec78d605201967e013b8881b13a04169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1a08295e8eda5c1ebb0c2b21a8a246b552dc0edc8387086eafde9bf18bb8cf582eeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b488203e880a0dde5deaba82898c1c0c63d244e5a59e1f7b8d660a8c390e600d230075a015a4588fa9d347d56bc2cb4f862f860800183016b4894a00000000000000000000000000000000000000080801ca0d33edc94825b2014a3f433643597c12717eb1c31a002b106bfd36f7c5f3585d4a057cf76e2958fa2458f2f7968732544f5ead49e6e82d493a1d08f44f4c85e7cabc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -419,8 +433,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095c46f6045a235209eaba53bb67e4004fe74ecc37838dac7941e26281807c7dda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd33d0bca0689e812bbad1bf53cdb0ad053ee6975feaa9be3eae977d2d4af3ae6",
-        "network" : "Homestead",
+        "lastblockhash" : "0x9225e1461aaf01d5c80e733b6b808bb1463b59da332ef39dbc56740e84011ff7",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b48",
@@ -475,10 +489,10 @@
             }
         }
     },
-    "RevertPrefoundEmptyOOG_d0g0v0_Metropolis" : {
+    "RevertPrefoundEmptyOOG_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/stRevertTest/RevertPrefoundEmptyOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -490,18 +504,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b48",
-                    "hash" : "0x9e37ff52eae650ee5143ac1135e5096b1e3c88c34642c2511f548218c6d7eca0",
-                    "mixHash" : "0xeffb7f87de3581adbaf0616bc1dd6d4813ec45f8d88f236da559ce2cdd22092d",
-                    "nonce" : "0xa074a9cde41e73b3",
+                    "hash" : "0x05f703a1dbe160f018e7b29311a6da73fdde28552d7d3fe0488d656ea380a2da",
+                    "mixHash" : "0xdb61d256826d9eb168908501cdf9bf2c124ad3fb6ae8331c54a90829bbcf57b3",
+                    "nonce" : "0xf5d0b1c67a7613fa",
                     "number" : "0x01",
                     "parentHash" : "0xc3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2fab",
-                    "receiptTrie" : "0x982f8a0eedb427918fbb2f3db7c5a72451437d3e482f851b69047ab57d90616d",
-                    "stateRoot" : "0x6f805aa2747d2c012d2313a93c4db0dc0047b9b73e78f9e10f786227093acc96",
+                    "receiptTrie" : "0x8295e8eda5c1ebb0c2b21a8a246b552dc0edc8387086eafde9bf18bb8cf582ee",
+                    "stateRoot" : "0xf03513d2e5333ae45cbad682d325fe32235d1dec78d605201967e013b8881b13",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2faba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06f805aa2747d2c012d2313a93c4db0dc0047b9b73e78f9e10f786227093acc96a04169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1a0982f8a0eedb427918fbb2f3db7c5a72451437d3e482f851b69047ab57d90616db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b488203e880a0effb7f87de3581adbaf0616bc1dd6d4813ec45f8d88f236da559ce2cdd22092d88a074a9cde41e73b3f862f860800183016b4894a00000000000000000000000000000000000000080801ca0d33edc94825b2014a3f433643597c12717eb1c31a002b106bfd36f7c5f3585d4a057cf76e2958fa2458f2f7968732544f5ead49e6e82d493a1d08f44f4c85e7cabc0",
+                "rlp" : "0xf90260f901f8a0c3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2faba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f03513d2e5333ae45cbad682d325fe32235d1dec78d605201967e013b8881b13a04169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1a08295e8eda5c1ebb0c2b21a8a246b552dc0edc8387086eafde9bf18bb8cf582eeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b488203e880a0db61d256826d9eb168908501cdf9bf2c124ad3fb6ae8331c54a90829bbcf57b388f5d0b1c67a7613faf862f860800183016b4894a00000000000000000000000000000000000000080801ca0d33edc94825b2014a3f433643597c12717eb1c31a002b106bfd36f7c5f3585d4a057cf76e2958fa2458f2f7968732544f5ead49e6e82d493a1d08f44f4c85e7cabc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -538,16 +552,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095c46f6045a235209eaba53bb67e4004fe74ecc37838dac7941e26281807c7dda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9e37ff52eae650ee5143ac1135e5096b1e3c88c34642c2511f548218c6d7eca0",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x05f703a1dbe160f018e7b29311a6da73fdde28552d7d3fe0488d656ea380a2da",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f56b48",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x602060006000f0600055600c600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3a4b8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x602060006000f0600055600c600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertPrefoundEmptyOOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertPrefoundEmptyOOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x016b48",
+                    "hash" : "0xd6b0e9446c9d002adb7fcf1160d70a6b310866a3bbd93a837d363cb11cabcf9d",
+                    "mixHash" : "0x9246f251215ab567768ca6746256956356160091bb114e0e8ddb6d57167555f5",
+                    "nonce" : "0x7c879de24ecd06aa",
+                    "number" : "0x01",
+                    "parentHash" : "0xc3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2fab",
+                    "receiptTrie" : "0x8295e8eda5c1ebb0c2b21a8a246b552dc0edc8387086eafde9bf18bb8cf582ee",
+                    "stateRoot" : "0xf03513d2e5333ae45cbad682d325fe32235d1dec78d605201967e013b8881b13",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0c3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2faba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f03513d2e5333ae45cbad682d325fe32235d1dec78d605201967e013b8881b13a04169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1a08295e8eda5c1ebb0c2b21a8a246b552dc0edc8387086eafde9bf18bb8cf582eeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b488203e880a09246f251215ab567768ca6746256956356160091bb114e0e8ddb6d57167555f5887c879de24ecd06aaf862f860800183016b4894a00000000000000000000000000000000000000080801ca0d33edc94825b2014a3f433643597c12717eb1c31a002b106bfd36f7c5f3585d4a057cf76e2958fa2458f2f7968732544f5ead49e6e82d493a1d08f44f4c85e7cabc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x016b48",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd33edc94825b2014a3f433643597c12717eb1c31a002b106bfd36f7c5f3585d4",
+                        "s" : "0x57cf76e2958fa2458f2f7968732544f5ead49e6e82d493a1d08f44f4c85e7cab",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xc3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2fab",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x95c46f6045a235209eaba53bb67e4004fe74ecc37838dac7941e26281807c7dd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095c46f6045a235209eaba53bb67e4004fe74ecc37838dac7941e26281807c7dda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd6b0e9446c9d002adb7fcf1160d70a6b310866a3bbd93a837d363cb11cabcf9d",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b48",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundEmpty_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundEmpty_d0g0v0.json
index b44d68009..9f654d4dc 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundEmpty_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundEmpty_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertPrefoundEmpty_d0g0v0_EIP150" : {
+    "RevertPrefoundEmpty_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/stRevertTest/RevertPrefoundEmpty_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0xd47d1fb53e3bbfcb6c6b5ee01583de63e8f42430db428f3d351dae76cb37cb25",
-                    "mixHash" : "0x16be9c52b0c2d235e322dba189f07232d7c2964304336f166af2045600c55af1",
-                    "nonce" : "0xce464d1a32cf59c8",
+                    "hash" : "0xff0a271cc9d66fe8ee99b57e26e9a0da45878d12de78995ecd031d7dd9d6e2df",
+                    "mixHash" : "0x45cde833ccce138b8871aa2c65a990305ad84848362751eece9e86b5fd2e57dd",
+                    "nonce" : "0xc175cc9279f1fa90",
                     "number" : "0x01",
                     "parentHash" : "0xc3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2fab",
-                    "receiptTrie" : "0xd021d2660c2f862f6b882b0bdfa58515243e7204f2c37bd1bdfe4463b404c3de",
-                    "stateRoot" : "0xbbba2eca41bdb4ec4b47ef8220bb545535e3b6b21510082e9561fcb4f8dc6ff2",
+                    "receiptTrie" : "0xa1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2e",
+                    "stateRoot" : "0x289020918929bf4577b88dcb5ad0d85b7299dba5643408dd48eb8a694046bb6d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2faba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbba2eca41bdb4ec4b47ef8220bb545535e3b6b21510082e9561fcb4f8dc6ff2a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0d021d2660c2f862f6b882b0bdfa58515243e7204f2c37bd1bdfe4463b404c3deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a016be9c52b0c2d235e322dba189f07232d7c2964304336f166af2045600c55af188ce464d1a32cf59c8f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
+                "rlp" : "0xf90260f901f8a0c3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2faba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0289020918929bf4577b88dcb5ad0d85b7299dba5643408dd48eb8a694046bb6da0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0a1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a045cde833ccce138b8871aa2c65a990305ad84848362751eece9e86b5fd2e57dd88c175cc9279f1fa90f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095c46f6045a235209eaba53bb67e4004fe74ecc37838dac7941e26281807c7dda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd47d1fb53e3bbfcb6c6b5ee01583de63e8f42430db428f3d351dae76cb37cb25",
-        "network" : "EIP150",
+        "lastblockhash" : "0xff0a271cc9d66fe8ee99b57e26e9a0da45878d12de78995ecd031d7dd9d6e2df",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
                 "code" : "",
@@ -75,7 +82,7 @@
             "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             },
@@ -120,10 +127,10 @@
             }
         }
     },
-    "RevertPrefoundEmpty_d0g0v0_EIP158" : {
+    "RevertPrefoundEmpty_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/stRevertTest/RevertPrefoundEmpty_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,18 +142,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0x48c67ab768672213257924d2ad3a2af2b16745d68fcb569892b7966fde87e4ba",
-                    "mixHash" : "0x5c91eda183e64a7385295f0cb4a1c8f8a4074291f0dc440e45c88bba27e568d1",
-                    "nonce" : "0xce0fdae8944538ee",
+                    "hash" : "0x34c694c13cf9f5616146c59f354512b9fdb2335574e6cbf1e7513df4118c45eb",
+                    "mixHash" : "0x8d09cea90e48999b4c1b4e7e4f832655a58b2a25916bd54b8b31e82937f40b18",
+                    "nonce" : "0x3eddd8ff49ba9eee",
                     "number" : "0x01",
                     "parentHash" : "0xc3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2fab",
-                    "receiptTrie" : "0x207c58be4f1bc85a73a1c51eaf0ae8dc28630d6263f616336b79c52d25d40c18",
-                    "stateRoot" : "0xba1f0215d536d77e0fa0bbb275ee00973257efee95b2f21841501e9990dc1a22",
+                    "receiptTrie" : "0xa1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2e",
+                    "stateRoot" : "0x289020918929bf4577b88dcb5ad0d85b7299dba5643408dd48eb8a694046bb6d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2faba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba1f0215d536d77e0fa0bbb275ee00973257efee95b2f21841501e9990dc1a22a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0207c58be4f1bc85a73a1c51eaf0ae8dc28630d6263f616336b79c52d25d40c18b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a05c91eda183e64a7385295f0cb4a1c8f8a4074291f0dc440e45c88bba27e568d188ce0fdae8944538eef862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
+                "rlp" : "0xf90260f901f8a0c3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2faba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0289020918929bf4577b88dcb5ad0d85b7299dba5643408dd48eb8a694046bb6da0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0a1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a08d09cea90e48999b4c1b4e7e4f832655a58b2a25916bd54b8b31e82937f40b18883eddd8ff49ba9eeef862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,9 +190,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095c46f6045a235209eaba53bb67e4004fe74ecc37838dac7941e26281807c7dda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x48c67ab768672213257924d2ad3a2af2b16745d68fcb569892b7966fde87e4ba",
-        "network" : "EIP158",
+        "lastblockhash" : "0x34c694c13cf9f5616146c59f354512b9fdb2335574e6cbf1e7513df4118c45eb",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
                 "code" : "",
@@ -241,10 +255,10 @@
             }
         }
     },
-    "RevertPrefoundEmpty_d0g0v0_Frontier" : {
+    "RevertPrefoundEmpty_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/stRevertTest/RevertPrefoundEmpty_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -256,9 +270,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0xb3736485494b9724f26a8b2e1379dcef11e08fc6e145f9d30f5f9fca1ccd110e",
-                    "mixHash" : "0xb6d6ece8c87652573cf38fdf250e4068d168c37c342d058e9b2ae9932c51b337",
-                    "nonce" : "0xf5976758384433c0",
+                    "hash" : "0xbafed225407ea272f42ff48cadf467ae5c506d1a16c7d42608faa32ff49c6763",
+                    "mixHash" : "0x78619800f290b4cf1154b89915db385d6b638f8d51ab0a9cfabc0bbc1603a378",
+                    "nonce" : "0x33640c1f17a56559",
                     "number" : "0x01",
                     "parentHash" : "0xc3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2fab",
                     "receiptTrie" : "0xd021d2660c2f862f6b882b0bdfa58515243e7204f2c37bd1bdfe4463b404c3de",
@@ -267,7 +281,7 @@
                     "transactionsTrie" : "0xbe92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2faba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbba2eca41bdb4ec4b47ef8220bb545535e3b6b21510082e9561fcb4f8dc6ff2a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0d021d2660c2f862f6b882b0bdfa58515243e7204f2c37bd1bdfe4463b404c3deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a0b6d6ece8c87652573cf38fdf250e4068d168c37c342d058e9b2ae9932c51b33788f5976758384433c0f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
+                "rlp" : "0xf90260f901f8a0c3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2faba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbba2eca41bdb4ec4b47ef8220bb545535e3b6b21510082e9561fcb4f8dc6ff2a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0d021d2660c2f862f6b882b0bdfa58515243e7204f2c37bd1bdfe4463b404c3deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a078619800f290b4cf1154b89915db385d6b638f8d51ab0a9cfabc0bbc1603a3788833640c1f17a56559f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,8 +318,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095c46f6045a235209eaba53bb67e4004fe74ecc37838dac7941e26281807c7dda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb3736485494b9724f26a8b2e1379dcef11e08fc6e145f9d30f5f9fca1ccd110e",
-        "network" : "Frontier",
+        "lastblockhash" : "0xbafed225407ea272f42ff48cadf467ae5c506d1a16c7d42608faa32ff49c6763",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
@@ -362,10 +376,10 @@
             }
         }
     },
-    "RevertPrefoundEmpty_d0g0v0_Homestead" : {
+    "RevertPrefoundEmpty_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/stRevertTest/RevertPrefoundEmpty_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -377,18 +391,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0x2c4175ac60a45b866bb5145469a856cc9a3caf7c785cfdea22d99d7efca7fa29",
-                    "mixHash" : "0x0c1da0192e9965476fdafa4e4f1f87c77cd729debc861f552d5b3e5bcfee24e1",
-                    "nonce" : "0xc2be721ddfbd4476",
+                    "hash" : "0xb89bd1c9952e433ee7843a7c85809e64bfba208a7862f1ff388e15309f5e4255",
+                    "mixHash" : "0x8b10e5b85775695c078a0f66083f67c47bf210a10e68677b973ea4b6907d2399",
+                    "nonce" : "0xc50feb1749cb38fc",
                     "number" : "0x01",
                     "parentHash" : "0xc3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2fab",
-                    "receiptTrie" : "0xd021d2660c2f862f6b882b0bdfa58515243e7204f2c37bd1bdfe4463b404c3de",
-                    "stateRoot" : "0xbbba2eca41bdb4ec4b47ef8220bb545535e3b6b21510082e9561fcb4f8dc6ff2",
+                    "receiptTrie" : "0x207c58be4f1bc85a73a1c51eaf0ae8dc28630d6263f616336b79c52d25d40c18",
+                    "stateRoot" : "0xba1f0215d536d77e0fa0bbb275ee00973257efee95b2f21841501e9990dc1a22",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2faba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbba2eca41bdb4ec4b47ef8220bb545535e3b6b21510082e9561fcb4f8dc6ff2a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0d021d2660c2f862f6b882b0bdfa58515243e7204f2c37bd1bdfe4463b404c3deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a00c1da0192e9965476fdafa4e4f1f87c77cd729debc861f552d5b3e5bcfee24e188c2be721ddfbd4476f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
+                "rlp" : "0xf90260f901f8a0c3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2faba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba1f0215d536d77e0fa0bbb275ee00973257efee95b2f21841501e9990dc1a22a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0207c58be4f1bc85a73a1c51eaf0ae8dc28630d6263f616336b79c52d25d40c18b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a08b10e5b85775695c078a0f66083f67c47bf210a10e68677b973ea4b6907d239988c50feb1749cb38fcf862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +439,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095c46f6045a235209eaba53bb67e4004fe74ecc37838dac7941e26281807c7dda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2c4175ac60a45b866bb5145469a856cc9a3caf7c785cfdea22d99d7efca7fa29",
-        "network" : "Homestead",
+        "lastblockhash" : "0xb89bd1c9952e433ee7843a7c85809e64bfba208a7862f1ff388e15309f5e4255",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
@@ -438,7 +452,7 @@
             "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             },
@@ -483,10 +497,10 @@
             }
         }
     },
-    "RevertPrefoundEmpty_d0g0v0_Metropolis" : {
+    "RevertPrefoundEmpty_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/stRevertTest/RevertPrefoundEmpty_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -498,18 +512,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0xc22f976804040cf635104253070491e5589ede6ffdbe88b24f53ffea22cb9112",
-                    "mixHash" : "0x32ef0d2eedf2f58947427af319b17974a206f114fe45ea45ffa1a7ccaec82868",
-                    "nonce" : "0x25c0afbc229185e7",
+                    "hash" : "0x306a4a8d3a8d48330b3fa7be86f6f042ffa97f3663297ad2254d036929e5bc4e",
+                    "mixHash" : "0xf9e4c09acd63d68b724a6ecb9918e641b20a90a1208807e5ec9b4a6730ba5897",
+                    "nonce" : "0x3db78f6f61524205",
                     "number" : "0x01",
                     "parentHash" : "0xc3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2fab",
-                    "receiptTrie" : "0xa1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2e",
-                    "stateRoot" : "0x289020918929bf4577b88dcb5ad0d85b7299dba5643408dd48eb8a694046bb6d",
+                    "receiptTrie" : "0xd021d2660c2f862f6b882b0bdfa58515243e7204f2c37bd1bdfe4463b404c3de",
+                    "stateRoot" : "0xbbba2eca41bdb4ec4b47ef8220bb545535e3b6b21510082e9561fcb4f8dc6ff2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2faba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0289020918929bf4577b88dcb5ad0d85b7299dba5643408dd48eb8a694046bb6da0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0a1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a032ef0d2eedf2f58947427af319b17974a206f114fe45ea45ffa1a7ccaec828688825c0afbc229185e7f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
+                "rlp" : "0xf90260f901f8a0c3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2faba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbba2eca41bdb4ec4b47ef8220bb545535e3b6b21510082e9561fcb4f8dc6ff2a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0d021d2660c2f862f6b882b0bdfa58515243e7204f2c37bd1bdfe4463b404c3deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a0f9e4c09acd63d68b724a6ecb9918e641b20a90a1208807e5ec9b4a6730ba5897883db78f6f61524205f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -546,16 +560,130 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095c46f6045a235209eaba53bb67e4004fe74ecc37838dac7941e26281807c7dda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc22f976804040cf635104253070491e5589ede6ffdbe88b24f53ffea22cb9112",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x306a4a8d3a8d48330b3fa7be86f6f042ffa97f3663297ad2254d036929e5bc4e",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f56b5d",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x602060006000f0600055600c600155",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7",
+                    "0x01" : "0x0c"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3a4a3",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x602060006000f0600055600c600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertPrefoundEmpty_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertPrefoundEmpty_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x016b5d",
+                    "hash" : "0x52a3b17aaf815872b57b11be7493f6b0ac4ea8f4be08b1518f84e788852aae70",
+                    "mixHash" : "0x9343ff532fc68ec4d4a21fac2a600f49bb97303f2ccc71470be6ff15e2a629d2",
+                    "nonce" : "0x385f98294b6273c4",
+                    "number" : "0x01",
+                    "parentHash" : "0xc3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2fab",
+                    "receiptTrie" : "0xd021d2660c2f862f6b882b0bdfa58515243e7204f2c37bd1bdfe4463b404c3de",
+                    "stateRoot" : "0xbbba2eca41bdb4ec4b47ef8220bb545535e3b6b21510082e9561fcb4f8dc6ff2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xbe92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0c3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2faba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbba2eca41bdb4ec4b47ef8220bb545535e3b6b21510082e9561fcb4f8dc6ff2a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0d021d2660c2f862f6b882b0bdfa58515243e7204f2c37bd1bdfe4463b404c3deb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a09343ff532fc68ec4d4a21fac2a600f49bb97303f2ccc71470be6ff15e2a629d288385f98294b6273c4f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x016f30",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfd",
+                        "s" : "0x6abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xc3f7fbaf4c51f16b8a6a97b651613c3d77854fe92e526115fd73685af21a2fab",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x95c46f6045a235209eaba53bb67e4004fe74ecc37838dac7941e26281807c7dd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095c46f6045a235209eaba53bb67e4004fe74ecc37838dac7941e26281807c7dda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x52a3b17aaf815872b57b11be7493f6b0ac4ea8f4be08b1518f84e788852aae70",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
                 "code" : "",
@@ -566,7 +694,7 @@
             "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundOOG_d0g0v0.json
index 38992438b..711c4428a 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefoundOOG_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertPrefoundOOG_d0g0v0_EIP150" : {
+    "RevertPrefoundOOG_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/stRevertTest/RevertPrefoundOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b48",
-                    "hash" : "0x743dca3bc47809b2bfa0cfb4fc0a04526e65a5fc9dc273e9231fe157314c1e29",
-                    "mixHash" : "0x6bae8043827e80f0b4ba0e00c054986a81562bfca9f0fabc53179545d170c342",
-                    "nonce" : "0xb326b1817a14a250",
+                    "hash" : "0xf294bbd5ff35a30be25719a35b3ca0e8b2bf267c2bee2ac609ad02f2c7d1fe21",
+                    "mixHash" : "0x240a48f7330bad7ff9e5858d81ca384f7534ca774d9863c879873283fd5f4699",
+                    "nonce" : "0x3a12c30b907109c4",
                     "number" : "0x01",
                     "parentHash" : "0x575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1",
-                    "receiptTrie" : "0xbd364c91862beb5cc7367c44bfe2a2450f6bf3f19029063ed773b20a2afa1345",
-                    "stateRoot" : "0x3450e641669fbafc849b6c59e30d72d6e770bb4d5af889f996e2e58f58943462",
+                    "receiptTrie" : "0x982f8a0eedb427918fbb2f3db7c5a72451437d3e482f851b69047ab57d90616d",
+                    "stateRoot" : "0xa6b33d435fed5b321aead298b5964ee00d9afe04e3880a859337b9b06d789b0c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03450e641669fbafc849b6c59e30d72d6e770bb4d5af889f996e2e58f58943462a04169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1a0bd364c91862beb5cc7367c44bfe2a2450f6bf3f19029063ed773b20a2afa1345b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b488203e880a06bae8043827e80f0b4ba0e00c054986a81562bfca9f0fabc53179545d170c34288b326b1817a14a250f862f860800183016b4894a00000000000000000000000000000000000000080801ca0d33edc94825b2014a3f433643597c12717eb1c31a002b106bfd36f7c5f3585d4a057cf76e2958fa2458f2f7968732544f5ead49e6e82d493a1d08f44f4c85e7cabc0",
+                "rlp" : "0xf90260f901f8a0575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6b33d435fed5b321aead298b5964ee00d9afe04e3880a859337b9b06d789b0ca04169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1a0982f8a0eedb427918fbb2f3db7c5a72451437d3e482f851b69047ab57d90616db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b488203e880a0240a48f7330bad7ff9e5858d81ca384f7534ca774d9863c879873283fd5f4699883a12c30b907109c4f862f860800183016b4894a00000000000000000000000000000000000000080801ca0d33edc94825b2014a3f433643597c12717eb1c31a002b106bfd36f7c5f3585d4a057cf76e2958fa2458f2f7968732544f5ead49e6e82d493a1d08f44f4c85e7cabc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06145ea5e1a8da1666a61c60c38aed206d476ae44b3448168f52ba5169aea97fda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x743dca3bc47809b2bfa0cfb4fc0a04526e65a5fc9dc273e9231fe157314c1e29",
-        "network" : "EIP150",
+        "lastblockhash" : "0xf294bbd5ff35a30be25719a35b3ca0e8b2bf267c2bee2ac609ad02f2c7d1fe21",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b48",
                 "code" : "",
@@ -118,10 +125,10 @@
             }
         }
     },
-    "RevertPrefoundOOG_d0g0v0_EIP158" : {
+    "RevertPrefoundOOG_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/stRevertTest/RevertPrefoundOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -133,18 +140,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b48",
-                    "hash" : "0x313183b8db73ef27802487064590e3688fb7c55fb31236e88e58cd692103bb20",
-                    "mixHash" : "0x5edfc63ab872bd6fc93c16f2afdfe8224311f5976755081dacf0cbc3721de26a",
-                    "nonce" : "0xb32bbc09836f023f",
+                    "hash" : "0x5bafa797522cb3d971497ff1a33109198198e2189b057a87011a62a63062087c",
+                    "mixHash" : "0xfe75ab425767445b83c25921a8982e71036aad04bad13ef90d113540f09f5d66",
+                    "nonce" : "0xd760e9402bf36d56",
                     "number" : "0x01",
                     "parentHash" : "0x575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1",
-                    "receiptTrie" : "0xbd364c91862beb5cc7367c44bfe2a2450f6bf3f19029063ed773b20a2afa1345",
-                    "stateRoot" : "0x3450e641669fbafc849b6c59e30d72d6e770bb4d5af889f996e2e58f58943462",
+                    "receiptTrie" : "0x982f8a0eedb427918fbb2f3db7c5a72451437d3e482f851b69047ab57d90616d",
+                    "stateRoot" : "0xa6b33d435fed5b321aead298b5964ee00d9afe04e3880a859337b9b06d789b0c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03450e641669fbafc849b6c59e30d72d6e770bb4d5af889f996e2e58f58943462a04169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1a0bd364c91862beb5cc7367c44bfe2a2450f6bf3f19029063ed773b20a2afa1345b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b488203e880a05edfc63ab872bd6fc93c16f2afdfe8224311f5976755081dacf0cbc3721de26a88b32bbc09836f023ff862f860800183016b4894a00000000000000000000000000000000000000080801ca0d33edc94825b2014a3f433643597c12717eb1c31a002b106bfd36f7c5f3585d4a057cf76e2958fa2458f2f7968732544f5ead49e6e82d493a1d08f44f4c85e7cabc0",
+                "rlp" : "0xf90260f901f8a0575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6b33d435fed5b321aead298b5964ee00d9afe04e3880a859337b9b06d789b0ca04169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1a0982f8a0eedb427918fbb2f3db7c5a72451437d3e482f851b69047ab57d90616db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b488203e880a0fe75ab425767445b83c25921a8982e71036aad04bad13ef90d113540f09f5d6688d760e9402bf36d56f862f860800183016b4894a00000000000000000000000000000000000000080801ca0d33edc94825b2014a3f433643597c12717eb1c31a002b106bfd36f7c5f3585d4a057cf76e2958fa2458f2f7968732544f5ead49e6e82d493a1d08f44f4c85e7cabc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -181,9 +188,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06145ea5e1a8da1666a61c60c38aed206d476ae44b3448168f52ba5169aea97fda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x313183b8db73ef27802487064590e3688fb7c55fb31236e88e58cd692103bb20",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5bafa797522cb3d971497ff1a33109198198e2189b057a87011a62a63062087c",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b48",
                 "code" : "",
@@ -237,10 +251,10 @@
             }
         }
     },
-    "RevertPrefoundOOG_d0g0v0_Frontier" : {
+    "RevertPrefoundOOG_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/stRevertTest/RevertPrefoundOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -252,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b48",
-                    "hash" : "0xd18414c5f2004234a6449775a3dd1c043705754c2ecec2ddd367ace6125b40b5",
-                    "mixHash" : "0xa799f20fd854706f702a843527c3770e7ede1d884650e094dafc1d41c75007df",
-                    "nonce" : "0xbe28380908f2b592",
+                    "hash" : "0x61ca981deeccf0dd1bc5320165ef3fce9b6ab98808047d06629a834a6b83bbb9",
+                    "mixHash" : "0xdeddee124dcdf152dfac1b6161d9706e6e599c87b1baa4489a61cdd28aea20c6",
+                    "nonce" : "0x6fa60af845413702",
                     "number" : "0x01",
                     "parentHash" : "0x575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1",
                     "receiptTrie" : "0xbd364c91862beb5cc7367c44bfe2a2450f6bf3f19029063ed773b20a2afa1345",
@@ -263,7 +277,7 @@
                     "transactionsTrie" : "0x4169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03450e641669fbafc849b6c59e30d72d6e770bb4d5af889f996e2e58f58943462a04169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1a0bd364c91862beb5cc7367c44bfe2a2450f6bf3f19029063ed773b20a2afa1345b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b488203e880a0a799f20fd854706f702a843527c3770e7ede1d884650e094dafc1d41c75007df88be28380908f2b592f862f860800183016b4894a00000000000000000000000000000000000000080801ca0d33edc94825b2014a3f433643597c12717eb1c31a002b106bfd36f7c5f3585d4a057cf76e2958fa2458f2f7968732544f5ead49e6e82d493a1d08f44f4c85e7cabc0",
+                "rlp" : "0xf90260f901f8a0575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03450e641669fbafc849b6c59e30d72d6e770bb4d5af889f996e2e58f58943462a04169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1a0bd364c91862beb5cc7367c44bfe2a2450f6bf3f19029063ed773b20a2afa1345b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b488203e880a0deddee124dcdf152dfac1b6161d9706e6e599c87b1baa4489a61cdd28aea20c6886fa60af845413702f862f860800183016b4894a00000000000000000000000000000000000000080801ca0d33edc94825b2014a3f433643597c12717eb1c31a002b106bfd36f7c5f3585d4a057cf76e2958fa2458f2f7968732544f5ead49e6e82d493a1d08f44f4c85e7cabc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -300,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06145ea5e1a8da1666a61c60c38aed206d476ae44b3448168f52ba5169aea97fda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd18414c5f2004234a6449775a3dd1c043705754c2ecec2ddd367ace6125b40b5",
-        "network" : "Frontier",
+        "lastblockhash" : "0x61ca981deeccf0dd1bc5320165ef3fce9b6ab98808047d06629a834a6b83bbb9",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b48",
@@ -356,10 +370,10 @@
             }
         }
     },
-    "RevertPrefoundOOG_d0g0v0_Homestead" : {
+    "RevertPrefoundOOG_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/stRevertTest/RevertPrefoundOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -371,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b48",
-                    "hash" : "0x8120c69883388a23cf8ed278b407397314f54a9544f7d912294fdff82802382e",
-                    "mixHash" : "0x62c0c22240f267d9e37845ba5bd381ee5999e2033007656fac5e3b1d6c943abf",
-                    "nonce" : "0x233aca3622638b3e",
+                    "hash" : "0x5631fee0bc7674081c57ab2b015c93f9741c3c2d214f053a2304d02d8288b744",
+                    "mixHash" : "0x357cf3aacd82b4722cce3873967e21fd3b3de067971a3c6ce096123910dd3096",
+                    "nonce" : "0x935a3b45032c9258",
                     "number" : "0x01",
                     "parentHash" : "0x575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1",
                     "receiptTrie" : "0xbd364c91862beb5cc7367c44bfe2a2450f6bf3f19029063ed773b20a2afa1345",
@@ -382,7 +396,7 @@
                     "transactionsTrie" : "0x4169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03450e641669fbafc849b6c59e30d72d6e770bb4d5af889f996e2e58f58943462a04169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1a0bd364c91862beb5cc7367c44bfe2a2450f6bf3f19029063ed773b20a2afa1345b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b488203e880a062c0c22240f267d9e37845ba5bd381ee5999e2033007656fac5e3b1d6c943abf88233aca3622638b3ef862f860800183016b4894a00000000000000000000000000000000000000080801ca0d33edc94825b2014a3f433643597c12717eb1c31a002b106bfd36f7c5f3585d4a057cf76e2958fa2458f2f7968732544f5ead49e6e82d493a1d08f44f4c85e7cabc0",
+                "rlp" : "0xf90260f901f8a0575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03450e641669fbafc849b6c59e30d72d6e770bb4d5af889f996e2e58f58943462a04169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1a0bd364c91862beb5cc7367c44bfe2a2450f6bf3f19029063ed773b20a2afa1345b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b488203e880a0357cf3aacd82b4722cce3873967e21fd3b3de067971a3c6ce096123910dd309688935a3b45032c9258f862f860800183016b4894a00000000000000000000000000000000000000080801ca0d33edc94825b2014a3f433643597c12717eb1c31a002b106bfd36f7c5f3585d4a057cf76e2958fa2458f2f7968732544f5ead49e6e82d493a1d08f44f4c85e7cabc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -419,8 +433,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06145ea5e1a8da1666a61c60c38aed206d476ae44b3448168f52ba5169aea97fda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8120c69883388a23cf8ed278b407397314f54a9544f7d912294fdff82802382e",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5631fee0bc7674081c57ab2b015c93f9741c3c2d214f053a2304d02d8288b744",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b48",
@@ -475,10 +489,10 @@
             }
         }
     },
-    "RevertPrefoundOOG_d0g0v0_Metropolis" : {
+    "RevertPrefoundOOG_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/stRevertTest/RevertPrefoundOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -490,18 +504,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b48",
-                    "hash" : "0x54b4cbe50e7be5795967627e106eb766825c8563b41f1fd67ba839342a3cb96e",
-                    "mixHash" : "0x0b924e74e83db1967a97577b0bf592435cefc4609c2e413ce12c230af947c06f",
-                    "nonce" : "0x39ad01a94ae27e43",
+                    "hash" : "0xb0d6b2678704ba7507a1307105ddef82456459cc982f4057f3089ae0a2158a6d",
+                    "mixHash" : "0x7290d92290ceaf29c2e8c883708d4ec1eb738025bccb493ac66d4e7cd661e421",
+                    "nonce" : "0x1ebc3d2a885051e9",
                     "number" : "0x01",
                     "parentHash" : "0x575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1",
-                    "receiptTrie" : "0x982f8a0eedb427918fbb2f3db7c5a72451437d3e482f851b69047ab57d90616d",
-                    "stateRoot" : "0xa6b33d435fed5b321aead298b5964ee00d9afe04e3880a859337b9b06d789b0c",
+                    "receiptTrie" : "0xbd364c91862beb5cc7367c44bfe2a2450f6bf3f19029063ed773b20a2afa1345",
+                    "stateRoot" : "0x3450e641669fbafc849b6c59e30d72d6e770bb4d5af889f996e2e58f58943462",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6b33d435fed5b321aead298b5964ee00d9afe04e3880a859337b9b06d789b0ca04169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1a0982f8a0eedb427918fbb2f3db7c5a72451437d3e482f851b69047ab57d90616db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b488203e880a00b924e74e83db1967a97577b0bf592435cefc4609c2e413ce12c230af947c06f8839ad01a94ae27e43f862f860800183016b4894a00000000000000000000000000000000000000080801ca0d33edc94825b2014a3f433643597c12717eb1c31a002b106bfd36f7c5f3585d4a057cf76e2958fa2458f2f7968732544f5ead49e6e82d493a1d08f44f4c85e7cabc0",
+                "rlp" : "0xf90260f901f8a0575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03450e641669fbafc849b6c59e30d72d6e770bb4d5af889f996e2e58f58943462a04169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1a0bd364c91862beb5cc7367c44bfe2a2450f6bf3f19029063ed773b20a2afa1345b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b488203e880a07290d92290ceaf29c2e8c883708d4ec1eb738025bccb493ac66d4e7cd661e421881ebc3d2a885051e9f862f860800183016b4894a00000000000000000000000000000000000000080801ca0d33edc94825b2014a3f433643597c12717eb1c31a002b106bfd36f7c5f3585d4a057cf76e2958fa2458f2f7968732544f5ead49e6e82d493a1d08f44f4c85e7cabc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -538,16 +552,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06145ea5e1a8da1666a61c60c38aed206d476ae44b3448168f52ba5169aea97fda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x54b4cbe50e7be5795967627e106eb766825c8563b41f1fd67ba839342a3cb96e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb0d6b2678704ba7507a1307105ddef82456459cc982f4057f3089ae0a2158a6d",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f56b48",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x602060006000f0600055600c600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3a4b8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x602060006000f0600055600c600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertPrefoundOOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertPrefoundOOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x016b48",
+                    "hash" : "0x41a78f2a17c049600875cc20ec409ae06ab7e434044fff943232b5170d6381da",
+                    "mixHash" : "0xe63210ec198fb070dee066ac3a669d6a0b4c1111f4d403b85327c80fba569d38",
+                    "nonce" : "0x56e539233276a384",
+                    "number" : "0x01",
+                    "parentHash" : "0x575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1",
+                    "receiptTrie" : "0xbd364c91862beb5cc7367c44bfe2a2450f6bf3f19029063ed773b20a2afa1345",
+                    "stateRoot" : "0x3450e641669fbafc849b6c59e30d72d6e770bb4d5af889f996e2e58f58943462",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03450e641669fbafc849b6c59e30d72d6e770bb4d5af889f996e2e58f58943462a04169e812fe662239d8c464c34515caa66dffa912859b360668668d35741543c1a0bd364c91862beb5cc7367c44bfe2a2450f6bf3f19029063ed773b20a2afa1345b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b488203e880a0e63210ec198fb070dee066ac3a669d6a0b4c1111f4d403b85327c80fba569d388856e539233276a384f862f860800183016b4894a00000000000000000000000000000000000000080801ca0d33edc94825b2014a3f433643597c12717eb1c31a002b106bfd36f7c5f3585d4a057cf76e2958fa2458f2f7968732544f5ead49e6e82d493a1d08f44f4c85e7cabc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x016b48",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd33edc94825b2014a3f433643597c12717eb1c31a002b106bfd36f7c5f3585d4",
+                        "s" : "0x57cf76e2958fa2458f2f7968732544f5ead49e6e82d493a1d08f44f4c85e7cab",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6145ea5e1a8da1666a61c60c38aed206d476ae44b3448168f52ba5169aea97fd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06145ea5e1a8da1666a61c60c38aed206d476ae44b3448168f52ba5169aea97fda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x41a78f2a17c049600875cc20ec409ae06ab7e434044fff943232b5170d6381da",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b48",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefound_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefound_d0g0v0.json
index 3e78843ab..302bab4f1 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefound_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertPrefound_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertPrefound_d0g0v0_EIP150" : {
+    "RevertPrefound_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/stRevertTest/RevertPrefound_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0x35aef7bbdf2eddebb367a8a3cc704e3b5b0f8d32e20f5b8d2dabbd3f632f7784",
-                    "mixHash" : "0x8b2df0ac7d6df24c9453f346bb3065e57c0aa549405bc0359ea3b1f6d32e8b34",
-                    "nonce" : "0xfb0aa85bef8000a3",
+                    "hash" : "0x980c8018428abfa2d9ed0f37c07001f3b418034e3d831ac8aa50cbf4d353e79a",
+                    "mixHash" : "0xdec975eefcac01098fac31124941cb17a129990abecc6d081b0f00a8a72fbcc8",
+                    "nonce" : "0x03150410c9f9b10a",
                     "number" : "0x01",
                     "parentHash" : "0x575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1",
-                    "receiptTrie" : "0xd7eba8272d81df1e6042ce9194d544bb9ba984e4ddeaaa33e3ff030e94b03903",
-                    "stateRoot" : "0x03999bbcda5e95f3c517062ab2908e1d232b6835a1782b7becbc770abedbb095",
+                    "receiptTrie" : "0xa1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2e",
+                    "stateRoot" : "0xe7043087f13fccbe9ce9252965d05161808c460db53f5547cbc1fcda1907e9cf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003999bbcda5e95f3c517062ab2908e1d232b6835a1782b7becbc770abedbb095a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0d7eba8272d81df1e6042ce9194d544bb9ba984e4ddeaaa33e3ff030e94b03903b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a08b2df0ac7d6df24c9453f346bb3065e57c0aa549405bc0359ea3b1f6d32e8b3488fb0aa85bef8000a3f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
+                "rlp" : "0xf90260f901f8a0575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7043087f13fccbe9ce9252965d05161808c460db53f5547cbc1fcda1907e9cfa0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0a1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a0dec975eefcac01098fac31124941cb17a129990abecc6d081b0f00a8a72fbcc88803150410c9f9b10af862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06145ea5e1a8da1666a61c60c38aed206d476ae44b3448168f52ba5169aea97fda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x35aef7bbdf2eddebb367a8a3cc704e3b5b0f8d32e20f5b8d2dabbd3f632f7784",
-        "network" : "EIP150",
+        "lastblockhash" : "0x980c8018428abfa2d9ed0f37c07001f3b418034e3d831ac8aa50cbf4d353e79a",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
                 "code" : "",
@@ -75,7 +82,7 @@
             "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x01",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             },
@@ -120,10 +127,10 @@
             }
         }
     },
-    "RevertPrefound_d0g0v0_EIP158" : {
+    "RevertPrefound_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/stRevertTest/RevertPrefound_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,18 +142,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0xb5ad2a22602bfb20bad853b6b58cf1f4d4fbf39ab91fa772247289a266e4987e",
-                    "mixHash" : "0xcf200189b0960294b202949662e860361619cbc210672487450b4b455ab1a24b",
-                    "nonce" : "0x4018beb7a6fb1320",
+                    "hash" : "0x67315c249527bd09de0782a01a4e4470734b3f42307d79133ade07bcbe49f5b3",
+                    "mixHash" : "0xd7959f57184dc31dbd903a0427847e1dbb8023e356f630e4c1f88bc3820a5c2a",
+                    "nonce" : "0x372e85e0f03b6f8d",
                     "number" : "0x01",
                     "parentHash" : "0x575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1",
-                    "receiptTrie" : "0x237dfca6785a1647f5eeb581078089eca3a9437d3859b7fa04efd1ec3894ad94",
-                    "stateRoot" : "0xd2d5981c33fb3cf833bc2a505662275140a03c0ff0ee0229bb8ad2c6c93d3d35",
+                    "receiptTrie" : "0xa1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2e",
+                    "stateRoot" : "0xe7043087f13fccbe9ce9252965d05161808c460db53f5547cbc1fcda1907e9cf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2d5981c33fb3cf833bc2a505662275140a03c0ff0ee0229bb8ad2c6c93d3d35a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0237dfca6785a1647f5eeb581078089eca3a9437d3859b7fa04efd1ec3894ad94b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a0cf200189b0960294b202949662e860361619cbc210672487450b4b455ab1a24b884018beb7a6fb1320f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
+                "rlp" : "0xf90260f901f8a0575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7043087f13fccbe9ce9252965d05161808c460db53f5547cbc1fcda1907e9cfa0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0a1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a0d7959f57184dc31dbd903a0427847e1dbb8023e356f630e4c1f88bc3820a5c2a88372e85e0f03b6f8df862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,9 +190,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06145ea5e1a8da1666a61c60c38aed206d476ae44b3448168f52ba5169aea97fda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb5ad2a22602bfb20bad853b6b58cf1f4d4fbf39ab91fa772247289a266e4987e",
-        "network" : "EIP158",
+        "lastblockhash" : "0x67315c249527bd09de0782a01a4e4470734b3f42307d79133ade07bcbe49f5b3",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
                 "code" : "",
@@ -241,10 +255,10 @@
             }
         }
     },
-    "RevertPrefound_d0g0v0_Frontier" : {
+    "RevertPrefound_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/stRevertTest/RevertPrefound_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -256,9 +270,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0x2cc54ba3dce9a2a59c5227bde9750f8a89f246a9fbdb5f7772b2c39388b0366a",
-                    "mixHash" : "0x63a3dbc8cc29898271728842fe556bc50f7a155ee1f1ddf65679e1f9c14a906b",
-                    "nonce" : "0xe6bed449258fb8b0",
+                    "hash" : "0x4f5f3360a52a85e1336a1f53772cc08ac6a2c051bcb6bfe86309ebf0a8384470",
+                    "mixHash" : "0x09e226cffa24013a714a13b9932f299c862e8881b0e5e42e41c3564db924e60d",
+                    "nonce" : "0xa207c4fe859c65c3",
                     "number" : "0x01",
                     "parentHash" : "0x575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1",
                     "receiptTrie" : "0xd7eba8272d81df1e6042ce9194d544bb9ba984e4ddeaaa33e3ff030e94b03903",
@@ -267,7 +281,7 @@
                     "transactionsTrie" : "0xbe92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003999bbcda5e95f3c517062ab2908e1d232b6835a1782b7becbc770abedbb095a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0d7eba8272d81df1e6042ce9194d544bb9ba984e4ddeaaa33e3ff030e94b03903b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a063a3dbc8cc29898271728842fe556bc50f7a155ee1f1ddf65679e1f9c14a906b88e6bed449258fb8b0f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
+                "rlp" : "0xf90260f901f8a0575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003999bbcda5e95f3c517062ab2908e1d232b6835a1782b7becbc770abedbb095a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0d7eba8272d81df1e6042ce9194d544bb9ba984e4ddeaaa33e3ff030e94b03903b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a009e226cffa24013a714a13b9932f299c862e8881b0e5e42e41c3564db924e60d88a207c4fe859c65c3f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,8 +318,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06145ea5e1a8da1666a61c60c38aed206d476ae44b3448168f52ba5169aea97fda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2cc54ba3dce9a2a59c5227bde9750f8a89f246a9fbdb5f7772b2c39388b0366a",
-        "network" : "Frontier",
+        "lastblockhash" : "0x4f5f3360a52a85e1336a1f53772cc08ac6a2c051bcb6bfe86309ebf0a8384470",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
@@ -362,10 +376,10 @@
             }
         }
     },
-    "RevertPrefound_d0g0v0_Homestead" : {
+    "RevertPrefound_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/stRevertTest/RevertPrefound_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -377,18 +391,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0x79a380e316353d42fc589df84826ffa7da8e825d7af6746a0c733d04c7f6ea40",
-                    "mixHash" : "0x08b30b8dcb91a6cec6cf3832a4f2d3a617bfe08dabe2b5e40c748bdfd1869dbe",
-                    "nonce" : "0x3e317deeca72f009",
+                    "hash" : "0x031d411952c468df2d9c0fabf6e6edcfe9c546c29151e86b4e1dfafb46fbc04a",
+                    "mixHash" : "0xb48f86fc930a32002c97674c0e8d6f9cc29d901dd8b162d0ef87d26ca8787ed8",
+                    "nonce" : "0xdb814ed2d207ac07",
                     "number" : "0x01",
                     "parentHash" : "0x575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1",
-                    "receiptTrie" : "0xd7eba8272d81df1e6042ce9194d544bb9ba984e4ddeaaa33e3ff030e94b03903",
-                    "stateRoot" : "0x03999bbcda5e95f3c517062ab2908e1d232b6835a1782b7becbc770abedbb095",
+                    "receiptTrie" : "0x237dfca6785a1647f5eeb581078089eca3a9437d3859b7fa04efd1ec3894ad94",
+                    "stateRoot" : "0xd2d5981c33fb3cf833bc2a505662275140a03c0ff0ee0229bb8ad2c6c93d3d35",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003999bbcda5e95f3c517062ab2908e1d232b6835a1782b7becbc770abedbb095a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0d7eba8272d81df1e6042ce9194d544bb9ba984e4ddeaaa33e3ff030e94b03903b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a008b30b8dcb91a6cec6cf3832a4f2d3a617bfe08dabe2b5e40c748bdfd1869dbe883e317deeca72f009f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
+                "rlp" : "0xf90260f901f8a0575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2d5981c33fb3cf833bc2a505662275140a03c0ff0ee0229bb8ad2c6c93d3d35a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0237dfca6785a1647f5eeb581078089eca3a9437d3859b7fa04efd1ec3894ad94b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a0b48f86fc930a32002c97674c0e8d6f9cc29d901dd8b162d0ef87d26ca8787ed888db814ed2d207ac07f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +439,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06145ea5e1a8da1666a61c60c38aed206d476ae44b3448168f52ba5169aea97fda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x79a380e316353d42fc589df84826ffa7da8e825d7af6746a0c733d04c7f6ea40",
-        "network" : "Homestead",
+        "lastblockhash" : "0x031d411952c468df2d9c0fabf6e6edcfe9c546c29151e86b4e1dfafb46fbc04a",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
@@ -438,7 +452,7 @@
             "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x01",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             },
@@ -483,10 +497,10 @@
             }
         }
     },
-    "RevertPrefound_d0g0v0_Metropolis" : {
+    "RevertPrefound_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/stRevertTest/RevertPrefound_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -498,18 +512,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0xe94ad5398305d44ea17d3b2c5ea32a86e003497f643bfaf26df0686311f171ae",
-                    "mixHash" : "0x93b4016a3530c2fb53146aa920ea0652e9bfb0f12a95e5df42c38ee93cc3904f",
-                    "nonce" : "0x2c17022c7a1587c7",
+                    "hash" : "0x16a7dd942d8c5372f297b068b87eab9885b14dcf6564a60ebf52631b1afe27e2",
+                    "mixHash" : "0xbb700390c0d97a2ed9ee2afd2d1c9cd8e14b2361054fb3b9d211555299be911a",
+                    "nonce" : "0xf7d64710275ce467",
                     "number" : "0x01",
                     "parentHash" : "0x575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1",
-                    "receiptTrie" : "0xa1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2e",
-                    "stateRoot" : "0xe7043087f13fccbe9ce9252965d05161808c460db53f5547cbc1fcda1907e9cf",
+                    "receiptTrie" : "0xd7eba8272d81df1e6042ce9194d544bb9ba984e4ddeaaa33e3ff030e94b03903",
+                    "stateRoot" : "0x03999bbcda5e95f3c517062ab2908e1d232b6835a1782b7becbc770abedbb095",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7043087f13fccbe9ce9252965d05161808c460db53f5547cbc1fcda1907e9cfa0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0a1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a093b4016a3530c2fb53146aa920ea0652e9bfb0f12a95e5df42c38ee93cc3904f882c17022c7a1587c7f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
+                "rlp" : "0xf90260f901f8a0575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003999bbcda5e95f3c517062ab2908e1d232b6835a1782b7becbc770abedbb095a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0d7eba8272d81df1e6042ce9194d544bb9ba984e4ddeaaa33e3ff030e94b03903b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a0bb700390c0d97a2ed9ee2afd2d1c9cd8e14b2361054fb3b9d211555299be911a88f7d64710275ce467f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -546,16 +560,130 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06145ea5e1a8da1666a61c60c38aed206d476ae44b3448168f52ba5169aea97fda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe94ad5398305d44ea17d3b2c5ea32a86e003497f643bfaf26df0686311f171ae",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x16a7dd942d8c5372f297b068b87eab9885b14dcf6564a60ebf52631b1afe27e2",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f56b5d",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x602060006000f0600055600c600155",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7",
+                    "0x01" : "0x0c"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3a4a3",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+                "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x602060006000f0600055600c600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertPrefound_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertPrefound_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x016b5d",
+                    "hash" : "0x0f382fe3865bdeff804bd4f0c7facfe7c5c8b6ff13d3f66d3568ff2e8afed9f2",
+                    "mixHash" : "0x51fb207a9f941027ac13d067480ce567bae50448cb013c81e09d11f4a233f3d3",
+                    "nonce" : "0x2b426259bf4c6090",
+                    "number" : "0x01",
+                    "parentHash" : "0x575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1",
+                    "receiptTrie" : "0xd7eba8272d81df1e6042ce9194d544bb9ba984e4ddeaaa33e3ff030e94b03903",
+                    "stateRoot" : "0x03999bbcda5e95f3c517062ab2908e1d232b6835a1782b7becbc770abedbb095",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xbe92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003999bbcda5e95f3c517062ab2908e1d232b6835a1782b7becbc770abedbb095a0be92cc59c0500678bba4e86a9ecf77f7400981fa3debc90cd5e779a95ffcf029a0d7eba8272d81df1e6042ce9194d544bb9ba984e4ddeaaa33e3ff030e94b03903b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a051fb207a9f941027ac13d067480ce567bae50448cb013c81e09d11f4a233f3d3882b426259bf4c6090f862f860800183016f3094a00000000000000000000000000000000000000080801ba0681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfda06abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x016f30",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x681c4f4c33fdf332d341fed6aab19e202be5152ab1fd2bd044b7802a4200fcfd",
+                        "s" : "0x6abf33de194996e65af7fe1f594cd222920fcef7b8b8595ef368b2ad0328b1d1",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x575878eab175ec22eee356beb8a45a94535c8c75b980f38940df1bd428f076d1",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6145ea5e1a8da1666a61c60c38aed206d476ae44b3448168f52ba5169aea97fd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06145ea5e1a8da1666a61c60c38aed206d476ae44b3448168f52ba5169aea97fda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0f382fe3865bdeff804bd4f0c7facfe7c5c8b6ff13d3f66d3568ff2e8afed9f2",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
                 "code" : "",
@@ -566,7 +694,7 @@
             "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x01",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g0v0.json
index e69338fd0..29941b303 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertRemoteSubCallStorageOOG2_d0g0v0_EIP150" : {
+    "RevertRemoteSubCallStorageOOG2_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/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0297a2",
-                    "hash" : "0xfef675a10ca9da0ce0452bf19025763a3b885e3d0bf0d3281c8d21f345789958",
-                    "mixHash" : "0xf10b1d3b0f54dd922214cc41fa568a27ef0249242a468b8a3a9c072922323f87",
-                    "nonce" : "0x7385a9b611729fd9",
+                    "hash" : "0x04df527ba569037cb361b11cc386a9b6822592a5e5f0e27026269fd44df455dc",
+                    "mixHash" : "0x12c80bfd2f16129e728b9f3924b5991954f47f8889fa9e8f4e79d7898941b9ff",
+                    "nonce" : "0x6333efb44e33fc51",
                     "number" : "0x01",
                     "parentHash" : "0x83a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5",
-                    "receiptTrie" : "0x9d9c37b27c83c17d66961def17853945ceb35650b173c3c0a220aad844f9915c",
-                    "stateRoot" : "0x08bef629d393624f02eb2527e5110521bc0b145b9d74314e2504cba7bef58f6c",
+                    "receiptTrie" : "0xfee6aa7efb0f953f6a85da85f13e1bfd018cbe7c24b39bc6b1385347310c4b69",
+                    "stateRoot" : "0x83323d76f0b61c952a93ffbb63ebcc2d250637330cbf9dd374e34161f773a084",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe2a28959247b4c1d37efa150b95989fcdd09450e3b929420745ee4b98342ae91",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa008bef629d393624f02eb2527e5110521bc0b145b9d74314e2504cba7bef58f6ca0e2a28959247b4c1d37efa150b95989fcdd09450e3b929420745ee4b98342ae91a09d9c37b27c83c17d66961def17853945ceb35650b173c3c0a220aad844f9915cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830297a28203e880a0f10b1d3b0f54dd922214cc41fa568a27ef0249242a468b8a3a9c072922323f87887385a9b611729fd9f866f86480018302981094a0000000000000000000000000000000000000008084c04062261ba0efb2c3c59e51030866ab1b7c8189f0d8de83dfaea827b086dccb6a46ee671674a03e440ec9a36430b709dd4e874841015efb2567288e0c42c04e65b7a8b359d0ebc0",
+                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083323d76f0b61c952a93ffbb63ebcc2d250637330cbf9dd374e34161f773a084a0e2a28959247b4c1d37efa150b95989fcdd09450e3b929420745ee4b98342ae91a0fee6aa7efb0f953f6a85da85f13e1bfd018cbe7c24b39bc6b1385347310c4b69b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830297a28203e880a012c80bfd2f16129e728b9f3924b5991954f47f8889fa9e8f4e79d7898941b9ff886333efb44e33fc51f866f86480018302981094a0000000000000000000000000000000000000008084c04062261ba0efb2c3c59e51030866ab1b7c8189f0d8de83dfaea827b086dccb6a46ee671674a03e440ec9a36430b709dd4e874841015efb2567288e0c42c04e65b7a8b359d0ebc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bc0c1a44714a77c5ea1e838c9f03a3c998a763b021c99c1add2b60aa9147547a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfef675a10ca9da0ce0452bf19025763a3b885e3d0bf0d3281c8d21f345789958",
-        "network" : "EIP150",
+        "lastblockhash" : "0x04df527ba569037cb361b11cc386a9b6822592a5e5f0e27026269fd44df455dc",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f697a2",
                 "code" : "",
@@ -75,7 +82,7 @@
             "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x00",
                 "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a723058201d40a4f4ab84c9ed5c1e6f9e4574875993931efb14de8c4fc6be556ceeef5cc20029",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             },
@@ -113,10 +120,10 @@
             }
         }
     },
-    "RevertRemoteSubCallStorageOOG2_d0g0v0_EIP158" : {
+    "RevertRemoteSubCallStorageOOG2_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/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +135,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0297a2",
-                    "hash" : "0xdffb11415d0c9df10ed3f0cfdc9292e16af34541c4aebbbb0eabdf685fbdd1ea",
-                    "mixHash" : "0xeabbb417f68afff5153e3432094456f05806e4df9bc026eab6d3ed2b75b5eafe",
-                    "nonce" : "0x24fff9040485217c",
+                    "hash" : "0x24d380a5b6f9c0c1c09a5433a39e5d22d0fc7373eaeb6b913e551918f2a39f22",
+                    "mixHash" : "0xa1d8bdaa2832f66b99640c9262fa23628a4cada6c370952070ee2209d98550b5",
+                    "nonce" : "0xf6e959df6b63bdcf",
                     "number" : "0x01",
                     "parentHash" : "0x83a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5",
-                    "receiptTrie" : "0x164f9cc681223e16813cc1167ccd1e06f08618b74ec8120f662be21dbb8a56d3",
-                    "stateRoot" : "0x37f08a6dd5fd8a0d431a442c4f86c69f513d65ee00854d2288f0055b20283bb4",
+                    "receiptTrie" : "0xfee6aa7efb0f953f6a85da85f13e1bfd018cbe7c24b39bc6b1385347310c4b69",
+                    "stateRoot" : "0x83323d76f0b61c952a93ffbb63ebcc2d250637330cbf9dd374e34161f773a084",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe2a28959247b4c1d37efa150b95989fcdd09450e3b929420745ee4b98342ae91",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa037f08a6dd5fd8a0d431a442c4f86c69f513d65ee00854d2288f0055b20283bb4a0e2a28959247b4c1d37efa150b95989fcdd09450e3b929420745ee4b98342ae91a0164f9cc681223e16813cc1167ccd1e06f08618b74ec8120f662be21dbb8a56d3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830297a28203e880a0eabbb417f68afff5153e3432094456f05806e4df9bc026eab6d3ed2b75b5eafe8824fff9040485217cf866f86480018302981094a0000000000000000000000000000000000000008084c04062261ba0efb2c3c59e51030866ab1b7c8189f0d8de83dfaea827b086dccb6a46ee671674a03e440ec9a36430b709dd4e874841015efb2567288e0c42c04e65b7a8b359d0ebc0",
+                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083323d76f0b61c952a93ffbb63ebcc2d250637330cbf9dd374e34161f773a084a0e2a28959247b4c1d37efa150b95989fcdd09450e3b929420745ee4b98342ae91a0fee6aa7efb0f953f6a85da85f13e1bfd018cbe7c24b39bc6b1385347310c4b69b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830297a28203e880a0a1d8bdaa2832f66b99640c9262fa23628a4cada6c370952070ee2209d98550b588f6e959df6b63bdcff866f86480018302981094a0000000000000000000000000000000000000008084c04062261ba0efb2c3c59e51030866ab1b7c8189f0d8de83dfaea827b086dccb6a46ee671674a03e440ec9a36430b709dd4e874841015efb2567288e0c42c04e65b7a8b359d0ebc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -176,9 +183,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bc0c1a44714a77c5ea1e838c9f03a3c998a763b021c99c1add2b60aa9147547a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdffb11415d0c9df10ed3f0cfdc9292e16af34541c4aebbbb0eabdf685fbdd1ea",
-        "network" : "EIP158",
+        "lastblockhash" : "0x24d380a5b6f9c0c1c09a5433a39e5d22d0fc7373eaeb6b913e551918f2a39f22",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f697a2",
                 "code" : "",
@@ -227,10 +241,10 @@
             }
         }
     },
-    "RevertRemoteSubCallStorageOOG2_d0g0v0_Frontier" : {
+    "RevertRemoteSubCallStorageOOG2_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/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -241,19 +255,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x028fd2",
-                    "hash" : "0x1ae61003fdbff7b336d77f47619eefdb78d748877ae4353f3fad3714fb977dfc",
-                    "mixHash" : "0xdc6c0a2cf0b9e4c6f4b2f819598b7ab9a9ed798825ea43c5f8fa00e4bc6cf62b",
-                    "nonce" : "0x1ab2723503001075",
+                    "gasUsed" : "0x0297a2",
+                    "hash" : "0x9293e94e87b052f5499fa1080f8dc30c57fbbc71277152ab985ce19df9a9e072",
+                    "mixHash" : "0x7507175dc186151cad0e163f357a51e3be53df3f5e0db2a4dec5a70c0eee7dc5",
+                    "nonce" : "0xad168ee630cab7c3",
                     "number" : "0x01",
                     "parentHash" : "0x83a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5",
-                    "receiptTrie" : "0x29ee472fede214cab7d822fe6ec8b68357edb55798ab20007eefafb60b5e8c6d",
-                    "stateRoot" : "0xbbe6873e3e75cc643716d93b2e5a0e35d66f438e15224ae99f3b57c6d3774bad",
+                    "receiptTrie" : "0x9d9c37b27c83c17d66961def17853945ceb35650b173c3c0a220aad844f9915c",
+                    "stateRoot" : "0x08bef629d393624f02eb2527e5110521bc0b145b9d74314e2504cba7bef58f6c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe2a28959247b4c1d37efa150b95989fcdd09450e3b929420745ee4b98342ae91",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbe6873e3e75cc643716d93b2e5a0e35d66f438e15224ae99f3b57c6d3774bada0e2a28959247b4c1d37efa150b95989fcdd09450e3b929420745ee4b98342ae91a029ee472fede214cab7d822fe6ec8b68357edb55798ab20007eefafb60b5e8c6db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083028fd28203e880a0dc6c0a2cf0b9e4c6f4b2f819598b7ab9a9ed798825ea43c5f8fa00e4bc6cf62b881ab2723503001075f866f86480018302981094a0000000000000000000000000000000000000008084c04062261ba0efb2c3c59e51030866ab1b7c8189f0d8de83dfaea827b086dccb6a46ee671674a03e440ec9a36430b709dd4e874841015efb2567288e0c42c04e65b7a8b359d0ebc0",
+                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa008bef629d393624f02eb2527e5110521bc0b145b9d74314e2504cba7bef58f6ca0e2a28959247b4c1d37efa150b95989fcdd09450e3b929420745ee4b98342ae91a09d9c37b27c83c17d66961def17853945ceb35650b173c3c0a220aad844f9915cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830297a28203e880a07507175dc186151cad0e163f357a51e3be53df3f5e0db2a4dec5a70c0eee7dc588ad168ee630cab7c3f866f86480018302981094a0000000000000000000000000000000000000008084c04062261ba0efb2c3c59e51030866ab1b7c8189f0d8de83dfaea827b086dccb6a46ee671674a03e440ec9a36430b709dd4e874841015efb2567288e0c42c04e65b7a8b359d0ebc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -290,11 +304,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bc0c1a44714a77c5ea1e838c9f03a3c998a763b021c99c1add2b60aa9147547a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1ae61003fdbff7b336d77f47619eefdb78d748877ae4353f3fad3714fb977dfc",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9293e94e87b052f5499fa1080f8dc30c57fbbc71277152ab985ce19df9a9e072",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f68fd2",
+                "balance" : "0x4563918244f697a2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -317,7 +331,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2802e",
+                "balance" : "0xe8d4a2785e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -341,10 +355,10 @@
             }
         }
     },
-    "RevertRemoteSubCallStorageOOG2_d0g0v0_Homestead" : {
+    "RevertRemoteSubCallStorageOOG2_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/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -355,19 +369,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x028fd2",
-                    "hash" : "0x53b6ebb5942a753cab8798622c8dc18ecf80ebebd0416b40aea9186624df6d52",
-                    "mixHash" : "0xfd00910ac583c12ea3b461c2d2469e31a2a908656492973dce399187c8352604",
-                    "nonce" : "0xa96159c6f3a9e038",
+                    "gasUsed" : "0x0297a2",
+                    "hash" : "0x06b59797b775cce6f073dfd6efc4f1b420a3b2e4e41e997d91aa4e6142dba561",
+                    "mixHash" : "0x611fd9f63cc5f46ae16790493c693756dd6a845f2cd37e2c5cf28c6c06e4756b",
+                    "nonce" : "0x977baf9b41d84fa9",
                     "number" : "0x01",
                     "parentHash" : "0x83a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5",
-                    "receiptTrie" : "0x29ee472fede214cab7d822fe6ec8b68357edb55798ab20007eefafb60b5e8c6d",
-                    "stateRoot" : "0xbbe6873e3e75cc643716d93b2e5a0e35d66f438e15224ae99f3b57c6d3774bad",
+                    "receiptTrie" : "0x164f9cc681223e16813cc1167ccd1e06f08618b74ec8120f662be21dbb8a56d3",
+                    "stateRoot" : "0x37f08a6dd5fd8a0d431a442c4f86c69f513d65ee00854d2288f0055b20283bb4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe2a28959247b4c1d37efa150b95989fcdd09450e3b929420745ee4b98342ae91",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbe6873e3e75cc643716d93b2e5a0e35d66f438e15224ae99f3b57c6d3774bada0e2a28959247b4c1d37efa150b95989fcdd09450e3b929420745ee4b98342ae91a029ee472fede214cab7d822fe6ec8b68357edb55798ab20007eefafb60b5e8c6db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083028fd28203e880a0fd00910ac583c12ea3b461c2d2469e31a2a908656492973dce399187c835260488a96159c6f3a9e038f866f86480018302981094a0000000000000000000000000000000000000008084c04062261ba0efb2c3c59e51030866ab1b7c8189f0d8de83dfaea827b086dccb6a46ee671674a03e440ec9a36430b709dd4e874841015efb2567288e0c42c04e65b7a8b359d0ebc0",
+                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa037f08a6dd5fd8a0d431a442c4f86c69f513d65ee00854d2288f0055b20283bb4a0e2a28959247b4c1d37efa150b95989fcdd09450e3b929420745ee4b98342ae91a0164f9cc681223e16813cc1167ccd1e06f08618b74ec8120f662be21dbb8a56d3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830297a28203e880a0611fd9f63cc5f46ae16790493c693756dd6a845f2cd37e2c5cf28c6c06e4756b88977baf9b41d84fa9f866f86480018302981094a0000000000000000000000000000000000000008084c04062261ba0efb2c3c59e51030866ab1b7c8189f0d8de83dfaea827b086dccb6a46ee671674a03e440ec9a36430b709dd4e874841015efb2567288e0c42c04e65b7a8b359d0ebc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -404,11 +418,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bc0c1a44714a77c5ea1e838c9f03a3c998a763b021c99c1add2b60aa9147547a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x53b6ebb5942a753cab8798622c8dc18ecf80ebebd0416b40aea9186624df6d52",
-        "network" : "Homestead",
+        "lastblockhash" : "0x06b59797b775cce6f073dfd6efc4f1b420a3b2e4e41e997d91aa4e6142dba561",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f68fd2",
+                "balance" : "0x4563918244f697a2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -417,7 +431,7 @@
             "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x00",
                 "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a723058201d40a4f4ab84c9ed5c1e6f9e4574875993931efb14de8c4fc6be556ceeef5cc20029",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             },
@@ -431,7 +445,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2802e",
+                "balance" : "0xe8d4a2785e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -455,10 +469,10 @@
             }
         }
     },
-    "RevertRemoteSubCallStorageOOG2_d0g0v0_Metropolis" : {
+    "RevertRemoteSubCallStorageOOG2_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/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -469,19 +483,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0297a2",
-                    "hash" : "0xa68ab45e9d6aa9be72184d1560bd50b6173e2a7153e0219bc8620f8519a19304",
-                    "mixHash" : "0x761b35986e2c5a2cbb04678ca965ab5f0b4c461ff8586d4c90c29167b2fdccfe",
-                    "nonce" : "0x5b7046ec0e01fbce",
+                    "gasUsed" : "0x028fd2",
+                    "hash" : "0xe3bf8e76370ec16f7302e6162342c2f1e4b8f784fe5c60269f48fefcbf0cc4fa",
+                    "mixHash" : "0xc1999acda1ec1c7d3cd56eca041d8abbdf02d9add7a32cf8cba58fd6966d25cb",
+                    "nonce" : "0xb7e19932f4422917",
                     "number" : "0x01",
                     "parentHash" : "0x83a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5",
-                    "receiptTrie" : "0xfee6aa7efb0f953f6a85da85f13e1bfd018cbe7c24b39bc6b1385347310c4b69",
-                    "stateRoot" : "0x83323d76f0b61c952a93ffbb63ebcc2d250637330cbf9dd374e34161f773a084",
+                    "receiptTrie" : "0x29ee472fede214cab7d822fe6ec8b68357edb55798ab20007eefafb60b5e8c6d",
+                    "stateRoot" : "0xbbe6873e3e75cc643716d93b2e5a0e35d66f438e15224ae99f3b57c6d3774bad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe2a28959247b4c1d37efa150b95989fcdd09450e3b929420745ee4b98342ae91",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083323d76f0b61c952a93ffbb63ebcc2d250637330cbf9dd374e34161f773a084a0e2a28959247b4c1d37efa150b95989fcdd09450e3b929420745ee4b98342ae91a0fee6aa7efb0f953f6a85da85f13e1bfd018cbe7c24b39bc6b1385347310c4b69b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830297a28203e880a0761b35986e2c5a2cbb04678ca965ab5f0b4c461ff8586d4c90c29167b2fdccfe885b7046ec0e01fbcef866f86480018302981094a0000000000000000000000000000000000000008084c04062261ba0efb2c3c59e51030866ab1b7c8189f0d8de83dfaea827b086dccb6a46ee671674a03e440ec9a36430b709dd4e874841015efb2567288e0c42c04e65b7a8b359d0ebc0",
+                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbe6873e3e75cc643716d93b2e5a0e35d66f438e15224ae99f3b57c6d3774bada0e2a28959247b4c1d37efa150b95989fcdd09450e3b929420745ee4b98342ae91a029ee472fede214cab7d822fe6ec8b68357edb55798ab20007eefafb60b5e8c6db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083028fd28203e880a0c1999acda1ec1c7d3cd56eca041d8abbdf02d9add7a32cf8cba58fd6966d25cb88b7e19932f4422917f866f86480018302981094a0000000000000000000000000000000000000008084c04062261ba0efb2c3c59e51030866ab1b7c8189f0d8de83dfaea827b086dccb6a46ee671674a03e440ec9a36430b709dd4e874841015efb2567288e0c42c04e65b7a8b359d0ebc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -518,18 +532,125 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bc0c1a44714a77c5ea1e838c9f03a3c998a763b021c99c1add2b60aa9147547a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa68ab45e9d6aa9be72184d1560bd50b6173e2a7153e0219bc8620f8519a19304",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe3bf8e76370ec16f7302e6162342c2f1e4b8f784fe5c60269f48fefcbf0cc4fa",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f68fd2",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x00",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a723058201d40a4f4ab84c9ed5c1e6f9e4574875993931efb14de8c4fc6be556ceeef5cc20029",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c414610049578063c040622614610058575b610000565b346100005761005661007f565b005b346100005761006561008a565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b6000600060405161016f8061016b833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff166373027f6d306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b156100005760325a03f11561000057505050600d600081905550600e600181905550600191505b50905600606060405234610000575b610156806100196000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a723058201d40a4f4ab84c9ed5c1e6f9e4574875993931efb14de8c4fc6be556ceeef5cc20029a165627a7a72305820b3260ed34e660b9533216c5881783a6cc70a072f3dc8d26e835c4d14c3c2a7890029",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x0d",
+                    "0x01" : "0x0e"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2802e",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c414610049578063c040622614610058575b610000565b346100005761005661007f565b005b346100005761006561008a565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b6000600060405161016f8061016b833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff166373027f6d306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b156100005760325a03f11561000057505050600d600081905550600e600181905550600191505b50905600606060405234610000575b610156806100196000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a723058201d40a4f4ab84c9ed5c1e6f9e4574875993931efb14de8c4fc6be556ceeef5cc20029a165627a7a72305820b3260ed34e660b9533216c5881783a6cc70a072f3dc8d26e835c4d14c3c2a7890029",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertRemoteSubCallStorageOOG2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x028fd2",
+                    "hash" : "0x966e9dacbaf03064c9b151ae1b2e9baff877ea8528ccb64d3e2c630643e5c57c",
+                    "mixHash" : "0xfadeea87411bf2bdd1c51b959af5eaf0757215bcdb0a97b3673ce89746859b10",
+                    "nonce" : "0x96246a1ca04aa66c",
+                    "number" : "0x01",
+                    "parentHash" : "0x83a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5",
+                    "receiptTrie" : "0x29ee472fede214cab7d822fe6ec8b68357edb55798ab20007eefafb60b5e8c6d",
+                    "stateRoot" : "0xbbe6873e3e75cc643716d93b2e5a0e35d66f438e15224ae99f3b57c6d3774bad",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe2a28959247b4c1d37efa150b95989fcdd09450e3b929420745ee4b98342ae91",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbe6873e3e75cc643716d93b2e5a0e35d66f438e15224ae99f3b57c6d3774bada0e2a28959247b4c1d37efa150b95989fcdd09450e3b929420745ee4b98342ae91a029ee472fede214cab7d822fe6ec8b68357edb55798ab20007eefafb60b5e8c6db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083028fd28203e880a0fadeea87411bf2bdd1c51b959af5eaf0757215bcdb0a97b3673ce89746859b108896246a1ca04aa66cf866f86480018302981094a0000000000000000000000000000000000000008084c04062261ba0efb2c3c59e51030866ab1b7c8189f0d8de83dfaea827b086dccb6a46ee671674a03e440ec9a36430b709dd4e874841015efb2567288e0c42c04e65b7a8b359d0ebc0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x029810",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xefb2c3c59e51030866ab1b7c8189f0d8de83dfaea827b086dccb6a46ee671674",
+                        "s" : "0x3e440ec9a36430b709dd4e874841015efb2567288e0c42c04e65b7a8b359d0eb",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x83a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2bc0c1a44714a77c5ea1e838c9f03a3c998a763b021c99c1add2b60aa9147547",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bc0c1a44714a77c5ea1e838c9f03a3c998a763b021c99c1add2b60aa9147547a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x966e9dacbaf03064c9b151ae1b2e9baff877ea8528ccb64d3e2c630643e5c57c",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f697a2",
+                "balance" : "0x4563918244f68fd2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -538,7 +659,7 @@
             "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x00",
                 "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a723058201d40a4f4ab84c9ed5c1e6f9e4574875993931efb14de8c4fc6be556ceeef5cc20029",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
@@ -552,7 +673,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2785e",
+                "balance" : "0xe8d4a2802e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g1v0.json
index 4670ef720..3f116759a 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertRemoteSubCallStorageOOG2_d0g1v0_EIP150" : {
+    "RevertRemoteSubCallStorageOOG2_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0297a2",
-                    "hash" : "0xa5e632e03d8f6f0ecb7eae2d7c4be6fece7d6dcb4343a04a5b62ff66c998d814",
-                    "mixHash" : "0x576a56093805d54b8aa6833c18d5a86997da9b359a8c71ddd6c75e6446582d48",
-                    "nonce" : "0x1e87168d30f80fb9",
+                    "hash" : "0xefa3964520ecb2435c608c52b4184a0eeeccb772b837c857c24b75222243ad09",
+                    "mixHash" : "0x8871cd6c5d2b1635c0216c4715bb6d27b1c7375c7a65c480a25b62e0fd5cf99d",
+                    "nonce" : "0x0b0648d885ff0580",
                     "number" : "0x01",
                     "parentHash" : "0x83a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5",
-                    "receiptTrie" : "0x9d9c37b27c83c17d66961def17853945ceb35650b173c3c0a220aad844f9915c",
-                    "stateRoot" : "0x08bef629d393624f02eb2527e5110521bc0b145b9d74314e2504cba7bef58f6c",
+                    "receiptTrie" : "0xfee6aa7efb0f953f6a85da85f13e1bfd018cbe7c24b39bc6b1385347310c4b69",
+                    "stateRoot" : "0x83323d76f0b61c952a93ffbb63ebcc2d250637330cbf9dd374e34161f773a084",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa008bef629d393624f02eb2527e5110521bc0b145b9d74314e2504cba7bef58f6ca00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a09d9c37b27c83c17d66961def17853945ceb35650b173c3c0a220aad844f9915cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830297a28203e880a0576a56093805d54b8aa6833c18d5a86997da9b359a8c71ddd6c75e6446582d48881e87168d30f80fb9f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083323d76f0b61c952a93ffbb63ebcc2d250637330cbf9dd374e34161f773a084a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0fee6aa7efb0f953f6a85da85f13e1bfd018cbe7c24b39bc6b1385347310c4b69b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830297a28203e880a08871cd6c5d2b1635c0216c4715bb6d27b1c7375c7a65c480a25b62e0fd5cf99d880b0648d885ff0580f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bc0c1a44714a77c5ea1e838c9f03a3c998a763b021c99c1add2b60aa9147547a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa5e632e03d8f6f0ecb7eae2d7c4be6fece7d6dcb4343a04a5b62ff66c998d814",
-        "network" : "EIP150",
+        "lastblockhash" : "0xefa3964520ecb2435c608c52b4184a0eeeccb772b837c857c24b75222243ad09",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f697a2",
                 "code" : "",
@@ -75,7 +82,7 @@
             "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x00",
                 "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a723058201d40a4f4ab84c9ed5c1e6f9e4574875993931efb14de8c4fc6be556ceeef5cc20029",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             },
@@ -113,10 +120,10 @@
             }
         }
     },
-    "RevertRemoteSubCallStorageOOG2_d0g1v0_EIP158" : {
+    "RevertRemoteSubCallStorageOOG2_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +135,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0297a2",
-                    "hash" : "0x67f2a7870fc6af9f82b6957a86b1a7916a3dc24549ed9e1f52986545f5c34639",
-                    "mixHash" : "0xd9554582d79e9dd072d0c42e9aef81ff3efec15c3b9709ac5cff443c0fb8e0b0",
-                    "nonce" : "0x98ca5e8bf868c63a",
+                    "hash" : "0xfdd8c2ddd41e8d07face079327179d294a0733e8d25f1a1d478f7afd3e63453c",
+                    "mixHash" : "0x6fd010b24e5e4a376742d300b425084dabc080bfda26d7203c58879fc222ac3b",
+                    "nonce" : "0x0fa3b79170fa96fb",
                     "number" : "0x01",
                     "parentHash" : "0x83a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5",
-                    "receiptTrie" : "0x164f9cc681223e16813cc1167ccd1e06f08618b74ec8120f662be21dbb8a56d3",
-                    "stateRoot" : "0x37f08a6dd5fd8a0d431a442c4f86c69f513d65ee00854d2288f0055b20283bb4",
+                    "receiptTrie" : "0xfee6aa7efb0f953f6a85da85f13e1bfd018cbe7c24b39bc6b1385347310c4b69",
+                    "stateRoot" : "0x83323d76f0b61c952a93ffbb63ebcc2d250637330cbf9dd374e34161f773a084",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa037f08a6dd5fd8a0d431a442c4f86c69f513d65ee00854d2288f0055b20283bb4a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0164f9cc681223e16813cc1167ccd1e06f08618b74ec8120f662be21dbb8a56d3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830297a28203e880a0d9554582d79e9dd072d0c42e9aef81ff3efec15c3b9709ac5cff443c0fb8e0b08898ca5e8bf868c63af866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083323d76f0b61c952a93ffbb63ebcc2d250637330cbf9dd374e34161f773a084a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0fee6aa7efb0f953f6a85da85f13e1bfd018cbe7c24b39bc6b1385347310c4b69b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830297a28203e880a06fd010b24e5e4a376742d300b425084dabc080bfda26d7203c58879fc222ac3b880fa3b79170fa96fbf866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -176,9 +183,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bc0c1a44714a77c5ea1e838c9f03a3c998a763b021c99c1add2b60aa9147547a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x67f2a7870fc6af9f82b6957a86b1a7916a3dc24549ed9e1f52986545f5c34639",
-        "network" : "EIP158",
+        "lastblockhash" : "0xfdd8c2ddd41e8d07face079327179d294a0733e8d25f1a1d478f7afd3e63453c",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f697a2",
                 "code" : "",
@@ -227,10 +241,10 @@
             }
         }
     },
-    "RevertRemoteSubCallStorageOOG2_d0g1v0_Frontier" : {
+    "RevertRemoteSubCallStorageOOG2_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -241,19 +255,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x028fd2",
-                    "hash" : "0xd1ebbc61eacf6850777c0b9a72c8e9f1d1999e6d01d7a98ecaaf6726d35eb0a5",
-                    "mixHash" : "0x30c4156bb21f365255f2a00a035bbfd55f832c45be1c1013f747bf57b65484a1",
-                    "nonce" : "0x85d3442164563ec5",
+                    "gasUsed" : "0x0297a2",
+                    "hash" : "0xeaa0bd2841379597edff50b5269c9c3260998601af0f57edf1617e1a59739682",
+                    "mixHash" : "0x83f5168770ad65920cb964ac6a8b9033772cf9bd9726ef195a08a64b2c648a63",
+                    "nonce" : "0xc9ffc8201dbc4172",
                     "number" : "0x01",
                     "parentHash" : "0x83a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5",
-                    "receiptTrie" : "0x29ee472fede214cab7d822fe6ec8b68357edb55798ab20007eefafb60b5e8c6d",
-                    "stateRoot" : "0xbbe6873e3e75cc643716d93b2e5a0e35d66f438e15224ae99f3b57c6d3774bad",
+                    "receiptTrie" : "0x9d9c37b27c83c17d66961def17853945ceb35650b173c3c0a220aad844f9915c",
+                    "stateRoot" : "0x08bef629d393624f02eb2527e5110521bc0b145b9d74314e2504cba7bef58f6c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbe6873e3e75cc643716d93b2e5a0e35d66f438e15224ae99f3b57c6d3774bada00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a029ee472fede214cab7d822fe6ec8b68357edb55798ab20007eefafb60b5e8c6db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083028fd28203e880a030c4156bb21f365255f2a00a035bbfd55f832c45be1c1013f747bf57b65484a18885d3442164563ec5f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa008bef629d393624f02eb2527e5110521bc0b145b9d74314e2504cba7bef58f6ca00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a09d9c37b27c83c17d66961def17853945ceb35650b173c3c0a220aad844f9915cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830297a28203e880a083f5168770ad65920cb964ac6a8b9033772cf9bd9726ef195a08a64b2c648a6388c9ffc8201dbc4172f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -290,11 +304,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bc0c1a44714a77c5ea1e838c9f03a3c998a763b021c99c1add2b60aa9147547a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd1ebbc61eacf6850777c0b9a72c8e9f1d1999e6d01d7a98ecaaf6726d35eb0a5",
-        "network" : "Frontier",
+        "lastblockhash" : "0xeaa0bd2841379597edff50b5269c9c3260998601af0f57edf1617e1a59739682",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f68fd2",
+                "balance" : "0x4563918244f697a2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -317,7 +331,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2802e",
+                "balance" : "0xe8d4a2785e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -341,10 +355,10 @@
             }
         }
     },
-    "RevertRemoteSubCallStorageOOG2_d0g1v0_Homestead" : {
+    "RevertRemoteSubCallStorageOOG2_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -355,19 +369,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x028fd2",
-                    "hash" : "0xe6336950abede4ea775989af71cb89f88c03ca49e7f034ca925764edae447fe8",
-                    "mixHash" : "0xf7092a277561f246776e5f6721a25e4b065e2aff3d0f80b65fdca61ae5dc7ee8",
-                    "nonce" : "0x1bec29e069f06c5d",
+                    "gasUsed" : "0x0297a2",
+                    "hash" : "0x5b925daa36cfc5f581c21572f8413ec663988ff5cf94c579ad2e18836902a974",
+                    "mixHash" : "0xdc2badd33c558fa1d5333458da8ac1e4a6e2ed6da30f4eb387c235f17d9261d7",
+                    "nonce" : "0xdbd04eeb29bf5a83",
                     "number" : "0x01",
                     "parentHash" : "0x83a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5",
-                    "receiptTrie" : "0x29ee472fede214cab7d822fe6ec8b68357edb55798ab20007eefafb60b5e8c6d",
-                    "stateRoot" : "0xbbe6873e3e75cc643716d93b2e5a0e35d66f438e15224ae99f3b57c6d3774bad",
+                    "receiptTrie" : "0x164f9cc681223e16813cc1167ccd1e06f08618b74ec8120f662be21dbb8a56d3",
+                    "stateRoot" : "0x37f08a6dd5fd8a0d431a442c4f86c69f513d65ee00854d2288f0055b20283bb4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbe6873e3e75cc643716d93b2e5a0e35d66f438e15224ae99f3b57c6d3774bada00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a029ee472fede214cab7d822fe6ec8b68357edb55798ab20007eefafb60b5e8c6db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083028fd28203e880a0f7092a277561f246776e5f6721a25e4b065e2aff3d0f80b65fdca61ae5dc7ee8881bec29e069f06c5df866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa037f08a6dd5fd8a0d431a442c4f86c69f513d65ee00854d2288f0055b20283bb4a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0164f9cc681223e16813cc1167ccd1e06f08618b74ec8120f662be21dbb8a56d3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830297a28203e880a0dc2badd33c558fa1d5333458da8ac1e4a6e2ed6da30f4eb387c235f17d9261d788dbd04eeb29bf5a83f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -404,11 +418,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bc0c1a44714a77c5ea1e838c9f03a3c998a763b021c99c1add2b60aa9147547a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe6336950abede4ea775989af71cb89f88c03ca49e7f034ca925764edae447fe8",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5b925daa36cfc5f581c21572f8413ec663988ff5cf94c579ad2e18836902a974",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f68fd2",
+                "balance" : "0x4563918244f697a2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -417,7 +431,7 @@
             "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x00",
                 "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a723058201d40a4f4ab84c9ed5c1e6f9e4574875993931efb14de8c4fc6be556ceeef5cc20029",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             },
@@ -431,7 +445,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2802e",
+                "balance" : "0xe8d4a2785e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -455,10 +469,10 @@
             }
         }
     },
-    "RevertRemoteSubCallStorageOOG2_d0g1v0_Metropolis" : {
+    "RevertRemoteSubCallStorageOOG2_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -469,19 +483,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0297a2",
-                    "hash" : "0xac12368e814e651815680a0254e99dd219be0ed448b9bc51d3d702eee1cba2fa",
-                    "mixHash" : "0x19fc02a6ef87bfbd57a3f1426d1292fe7d41d17615e31a777ff0d7fab7082410",
-                    "nonce" : "0xed3d8eddcfee3356",
+                    "gasUsed" : "0x028fd2",
+                    "hash" : "0xa2f309a70cf76bd03b4ed03bcaad75defc1904bfaf04e9b59321288d7b40bafd",
+                    "mixHash" : "0xaef5f87beacee042ac01c2b296d34393012ee7af1b5f0bb2a601a96d4f89e3db",
+                    "nonce" : "0x29021a011ec0b447",
                     "number" : "0x01",
                     "parentHash" : "0x83a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5",
-                    "receiptTrie" : "0xfee6aa7efb0f953f6a85da85f13e1bfd018cbe7c24b39bc6b1385347310c4b69",
-                    "stateRoot" : "0x83323d76f0b61c952a93ffbb63ebcc2d250637330cbf9dd374e34161f773a084",
+                    "receiptTrie" : "0x29ee472fede214cab7d822fe6ec8b68357edb55798ab20007eefafb60b5e8c6d",
+                    "stateRoot" : "0xbbe6873e3e75cc643716d93b2e5a0e35d66f438e15224ae99f3b57c6d3774bad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083323d76f0b61c952a93ffbb63ebcc2d250637330cbf9dd374e34161f773a084a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0fee6aa7efb0f953f6a85da85f13e1bfd018cbe7c24b39bc6b1385347310c4b69b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830297a28203e880a019fc02a6ef87bfbd57a3f1426d1292fe7d41d17615e31a777ff0d7fab708241088ed3d8eddcfee3356f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbe6873e3e75cc643716d93b2e5a0e35d66f438e15224ae99f3b57c6d3774bada00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a029ee472fede214cab7d822fe6ec8b68357edb55798ab20007eefafb60b5e8c6db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083028fd28203e880a0aef5f87beacee042ac01c2b296d34393012ee7af1b5f0bb2a601a96d4f89e3db8829021a011ec0b447f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -518,18 +532,125 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bc0c1a44714a77c5ea1e838c9f03a3c998a763b021c99c1add2b60aa9147547a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xac12368e814e651815680a0254e99dd219be0ed448b9bc51d3d702eee1cba2fa",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xa2f309a70cf76bd03b4ed03bcaad75defc1904bfaf04e9b59321288d7b40bafd",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f68fd2",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x00",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a723058201d40a4f4ab84c9ed5c1e6f9e4574875993931efb14de8c4fc6be556ceeef5cc20029",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c414610049578063c040622614610058575b610000565b346100005761005661007f565b005b346100005761006561008a565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b6000600060405161016f8061016b833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff166373027f6d306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b156100005760325a03f11561000057505050600d600081905550600e600181905550600191505b50905600606060405234610000575b610156806100196000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a723058201d40a4f4ab84c9ed5c1e6f9e4574875993931efb14de8c4fc6be556ceeef5cc20029a165627a7a72305820b3260ed34e660b9533216c5881783a6cc70a072f3dc8d26e835c4d14c3c2a7890029",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x0d",
+                    "0x01" : "0x0e"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2802e",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c414610049578063c040622614610058575b610000565b346100005761005661007f565b005b346100005761006561008a565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b6000600060405161016f8061016b833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff166373027f6d306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b156100005760325a03f11561000057505050600d600081905550600e600181905550600191505b50905600606060405234610000575b610156806100196000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a723058201d40a4f4ab84c9ed5c1e6f9e4574875993931efb14de8c4fc6be556ceeef5cc20029a165627a7a72305820b3260ed34e660b9533216c5881783a6cc70a072f3dc8d26e835c4d14c3c2a7890029",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertRemoteSubCallStorageOOG2_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x028fd2",
+                    "hash" : "0x162f73ff750af88e4d924841a5fc9bd4231599deb521d5708a69b3251ce98fd5",
+                    "mixHash" : "0x1fa49381cac12023f4b88dfc4306bd8d0c1e39d47fe7da675f230c98a0b7be3c",
+                    "nonce" : "0x4893dd9bbbc6b485",
+                    "number" : "0x01",
+                    "parentHash" : "0x83a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5",
+                    "receiptTrie" : "0x29ee472fede214cab7d822fe6ec8b68357edb55798ab20007eefafb60b5e8c6d",
+                    "stateRoot" : "0xbbe6873e3e75cc643716d93b2e5a0e35d66f438e15224ae99f3b57c6d3774bad",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbe6873e3e75cc643716d93b2e5a0e35d66f438e15224ae99f3b57c6d3774bada00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a029ee472fede214cab7d822fe6ec8b68357edb55798ab20007eefafb60b5e8c6db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083028fd28203e880a01fa49381cac12023f4b88dfc4306bd8d0c1e39d47fe7da675f230c98a0b7be3c884893dd9bbbc6b485f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x02c308",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234e",
+                        "s" : "0x28495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x83a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2bc0c1a44714a77c5ea1e838c9f03a3c998a763b021c99c1add2b60aa9147547",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bc0c1a44714a77c5ea1e838c9f03a3c998a763b021c99c1add2b60aa9147547a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x162f73ff750af88e4d924841a5fc9bd4231599deb521d5708a69b3251ce98fd5",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f697a2",
+                "balance" : "0x4563918244f68fd2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -538,7 +659,7 @@
             "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x00",
                 "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a723058201d40a4f4ab84c9ed5c1e6f9e4574875993931efb14de8c4fc6be556ceeef5cc20029",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
@@ -552,7 +673,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2785e",
+                "balance" : "0xe8d4a2802e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g2v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g2v0.json
index 0886f9249..e99ba7daa 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g2v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertRemoteSubCallStorageOOG2_d0g2v0_EIP150" : {
+    "RevertRemoteSubCallStorageOOG2_d0g2v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g2v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x023668",
-                    "hash" : "0x785570f08533f01acadbe66af3c3fef21f8315815e8375f3a4b2157ce165bec6",
-                    "mixHash" : "0x40ae909dff91f6fd824c66f5236bf95a8be57f2c23344d92a7e9b51dbb46a3ca",
-                    "nonce" : "0x354db0c4ff6fdaaa",
+                    "hash" : "0xa4898db57b428b70e258148d80bbec04ee10e1319627f1a36bc6ec60c5f4750f",
+                    "mixHash" : "0x43f225c00f57402a9f5aafc245b58fa97304df8572569967ac2b48f874c29ee8",
+                    "nonce" : "0x9f8d301b61558b38",
                     "number" : "0x01",
                     "parentHash" : "0x83a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5",
-                    "receiptTrie" : "0xb535351083676540f6e5a48ce33e9392db230fd69503668c0b84d18b8226cacd",
-                    "stateRoot" : "0x02a2132f2614dee5ca8075a321898edbf37a86810c00cd33edc3dabd3988a50d",
+                    "receiptTrie" : "0xd8f57081f4ea2813a4f6b446d5a5b7600495c52ae075cfaebc8ae4d3f116e2e8",
+                    "stateRoot" : "0xd41f67158a32f0954f556b649bb88760bdc5777b6c1c74b5243adf5b37a6e4ac",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa002a2132f2614dee5ca8075a321898edbf37a86810c00cd33edc3dabd3988a50da09cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57a0b535351083676540f6e5a48ce33e9392db230fd69503668c0b84d18b8226cacdb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830236688203e880a040ae909dff91f6fd824c66f5236bf95a8be57f2c23344d92a7e9b51dbb46a3ca88354db0c4ff6fdaaaf866f86480018302366894a0000000000000000000000000000000000000008084c04062261ca00732ad0b6c7efd9b1cd2d1dba4835fc97621a2a9a684a1d78842d19a2ebe7d5aa04c5a1223779d015f2c0c4fa197264b30db097dde85b2dc4e758a7bf2d6bd2ec5c0",
+                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d41f67158a32f0954f556b649bb88760bdc5777b6c1c74b5243adf5b37a6e4aca09cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57a0d8f57081f4ea2813a4f6b446d5a5b7600495c52ae075cfaebc8ae4d3f116e2e8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830236688203e880a043f225c00f57402a9f5aafc245b58fa97304df8572569967ac2b48f874c29ee8889f8d301b61558b38f866f86480018302366894a0000000000000000000000000000000000000008084c04062261ca00732ad0b6c7efd9b1cd2d1dba4835fc97621a2a9a684a1d78842d19a2ebe7d5aa04c5a1223779d015f2c0c4fa197264b30db097dde85b2dc4e758a7bf2d6bd2ec5c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bc0c1a44714a77c5ea1e838c9f03a3c998a763b021c99c1add2b60aa9147547a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x785570f08533f01acadbe66af3c3fef21f8315815e8375f3a4b2157ce165bec6",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa4898db57b428b70e258148d80bbec04ee10e1319627f1a36bc6ec60c5f4750f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f63668",
                 "code" : "",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "RevertRemoteSubCallStorageOOG2_d0g2v0_EIP158" : {
+    "RevertRemoteSubCallStorageOOG2_d0g2v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g2v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x023668",
-                    "hash" : "0x057489a57a0be829e2b7ca489e678ab1661eb27388d892655b20b60c5543b9f5",
-                    "mixHash" : "0x843f2f59e1865ea430accef599d05fa55b1eaa084688d2d5385d0882bd2ac755",
-                    "nonce" : "0x609ce0b1170b4634",
+                    "hash" : "0xde241a7aa3d0ad146f615dcdb70645f6892f364bafeff3378b3ac7452cf3a89b",
+                    "mixHash" : "0x057721d0aad0f9a67f6f6eb6aa9e9349fb143cf15eaf62d7eb4be7f1ca7e2402",
+                    "nonce" : "0x8da8bdc6004cacdd",
                     "number" : "0x01",
                     "parentHash" : "0x83a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5",
-                    "receiptTrie" : "0xb535351083676540f6e5a48ce33e9392db230fd69503668c0b84d18b8226cacd",
-                    "stateRoot" : "0x02a2132f2614dee5ca8075a321898edbf37a86810c00cd33edc3dabd3988a50d",
+                    "receiptTrie" : "0xd8f57081f4ea2813a4f6b446d5a5b7600495c52ae075cfaebc8ae4d3f116e2e8",
+                    "stateRoot" : "0xd41f67158a32f0954f556b649bb88760bdc5777b6c1c74b5243adf5b37a6e4ac",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa002a2132f2614dee5ca8075a321898edbf37a86810c00cd33edc3dabd3988a50da09cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57a0b535351083676540f6e5a48ce33e9392db230fd69503668c0b84d18b8226cacdb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830236688203e880a0843f2f59e1865ea430accef599d05fa55b1eaa084688d2d5385d0882bd2ac75588609ce0b1170b4634f866f86480018302366894a0000000000000000000000000000000000000008084c04062261ca00732ad0b6c7efd9b1cd2d1dba4835fc97621a2a9a684a1d78842d19a2ebe7d5aa04c5a1223779d015f2c0c4fa197264b30db097dde85b2dc4e758a7bf2d6bd2ec5c0",
+                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d41f67158a32f0954f556b649bb88760bdc5777b6c1c74b5243adf5b37a6e4aca09cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57a0d8f57081f4ea2813a4f6b446d5a5b7600495c52ae075cfaebc8ae4d3f116e2e8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830236688203e880a0057721d0aad0f9a67f6f6eb6aa9e9349fb143cf15eaf62d7eb4be7f1ca7e2402888da8bdc6004cacddf866f86480018302366894a0000000000000000000000000000000000000008084c04062261ca00732ad0b6c7efd9b1cd2d1dba4835fc97621a2a9a684a1d78842d19a2ebe7d5aa04c5a1223779d015f2c0c4fa197264b30db097dde85b2dc4e758a7bf2d6bd2ec5c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bc0c1a44714a77c5ea1e838c9f03a3c998a763b021c99c1add2b60aa9147547a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x057489a57a0be829e2b7ca489e678ab1661eb27388d892655b20b60c5543b9f5",
-        "network" : "EIP158",
+        "lastblockhash" : "0xde241a7aa3d0ad146f615dcdb70645f6892f364bafeff3378b3ac7452cf3a89b",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f63668",
                 "code" : "",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "RevertRemoteSubCallStorageOOG2_d0g2v0_Frontier" : {
+    "RevertRemoteSubCallStorageOOG2_d0g2v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g2v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x023668",
-                    "hash" : "0x10698e770f8c6bd3087c79e5d1f36f7410e06f2f9b43fed7aad312841712f4c9",
-                    "mixHash" : "0x87b36f1973f7b0edddabf9280cede3dc88832bceaeb2a4e379283964d53ab5f3",
-                    "nonce" : "0xd55295289330546e",
+                    "hash" : "0x04315ebfa785ac6d586c98a58990a8c0461b775a3b6dbbc710bc479163e11ec4",
+                    "mixHash" : "0x9636cf26a15ea9bcb18ddcd9bb10ad9987319fb11684a7190bec539202f1dfa1",
+                    "nonce" : "0x1b78d6c4be7f20d5",
                     "number" : "0x01",
                     "parentHash" : "0x83a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5",
                     "receiptTrie" : "0xb535351083676540f6e5a48ce33e9392db230fd69503668c0b84d18b8226cacd",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x9cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa002a2132f2614dee5ca8075a321898edbf37a86810c00cd33edc3dabd3988a50da09cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57a0b535351083676540f6e5a48ce33e9392db230fd69503668c0b84d18b8226cacdb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830236688203e880a087b36f1973f7b0edddabf9280cede3dc88832bceaeb2a4e379283964d53ab5f388d55295289330546ef866f86480018302366894a0000000000000000000000000000000000000008084c04062261ca00732ad0b6c7efd9b1cd2d1dba4835fc97621a2a9a684a1d78842d19a2ebe7d5aa04c5a1223779d015f2c0c4fa197264b30db097dde85b2dc4e758a7bf2d6bd2ec5c0",
+                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa002a2132f2614dee5ca8075a321898edbf37a86810c00cd33edc3dabd3988a50da09cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57a0b535351083676540f6e5a48ce33e9392db230fd69503668c0b84d18b8226cacdb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830236688203e880a09636cf26a15ea9bcb18ddcd9bb10ad9987319fb11684a7190bec539202f1dfa1881b78d6c4be7f20d5f866f86480018302366894a0000000000000000000000000000000000000008084c04062261ca00732ad0b6c7efd9b1cd2d1dba4835fc97621a2a9a684a1d78842d19a2ebe7d5aa04c5a1223779d015f2c0c4fa197264b30db097dde85b2dc4e758a7bf2d6bd2ec5c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bc0c1a44714a77c5ea1e838c9f03a3c998a763b021c99c1add2b60aa9147547a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x10698e770f8c6bd3087c79e5d1f36f7410e06f2f9b43fed7aad312841712f4c9",
-        "network" : "Frontier",
+        "lastblockhash" : "0x04315ebfa785ac6d586c98a58990a8c0461b775a3b6dbbc710bc479163e11ec4",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f63668",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "RevertRemoteSubCallStorageOOG2_d0g2v0_Homestead" : {
+    "RevertRemoteSubCallStorageOOG2_d0g2v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g2v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x023668",
-                    "hash" : "0x4f12f58c8d6e96fade5c1fa1e47f56a3cbbc5d0dd1477a42bde3f9bcf23404ad",
-                    "mixHash" : "0x7cb4134a3f5c6a65f868821a363c3b687f3a7d9f33d13f97799a5ac370ae4d07",
-                    "nonce" : "0xa7f2a06125e778a9",
+                    "hash" : "0xb2e6459330e12142bc01c0710c0cfbc3e7f7872c2a79106241f1500844c782e0",
+                    "mixHash" : "0xf4ee3344fb93bda51f9a2ccc2190f7800178a453f857d40d8c9315be69303cfe",
+                    "nonce" : "0x52f99e4dfffada80",
                     "number" : "0x01",
                     "parentHash" : "0x83a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5",
                     "receiptTrie" : "0xb535351083676540f6e5a48ce33e9392db230fd69503668c0b84d18b8226cacd",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x9cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa002a2132f2614dee5ca8075a321898edbf37a86810c00cd33edc3dabd3988a50da09cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57a0b535351083676540f6e5a48ce33e9392db230fd69503668c0b84d18b8226cacdb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830236688203e880a07cb4134a3f5c6a65f868821a363c3b687f3a7d9f33d13f97799a5ac370ae4d0788a7f2a06125e778a9f866f86480018302366894a0000000000000000000000000000000000000008084c04062261ca00732ad0b6c7efd9b1cd2d1dba4835fc97621a2a9a684a1d78842d19a2ebe7d5aa04c5a1223779d015f2c0c4fa197264b30db097dde85b2dc4e758a7bf2d6bd2ec5c0",
+                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa002a2132f2614dee5ca8075a321898edbf37a86810c00cd33edc3dabd3988a50da09cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57a0b535351083676540f6e5a48ce33e9392db230fd69503668c0b84d18b8226cacdb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830236688203e880a0f4ee3344fb93bda51f9a2ccc2190f7800178a453f857d40d8c9315be69303cfe8852f99e4dfffada80f866f86480018302366894a0000000000000000000000000000000000000008084c04062261ca00732ad0b6c7efd9b1cd2d1dba4835fc97621a2a9a684a1d78842d19a2ebe7d5aa04c5a1223779d015f2c0c4fa197264b30db097dde85b2dc4e758a7bf2d6bd2ec5c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bc0c1a44714a77c5ea1e838c9f03a3c998a763b021c99c1add2b60aa9147547a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4f12f58c8d6e96fade5c1fa1e47f56a3cbbc5d0dd1477a42bde3f9bcf23404ad",
-        "network" : "Homestead",
+        "lastblockhash" : "0xb2e6459330e12142bc01c0710c0cfbc3e7f7872c2a79106241f1500844c782e0",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f63668",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "RevertRemoteSubCallStorageOOG2_d0g2v0_Metropolis" : {
+    "RevertRemoteSubCallStorageOOG2_d0g2v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g2v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x023668",
-                    "hash" : "0x622c94198e2020762f76593f8e79bcd3ecafa502dcbaebbc07a7266de7fb3cd7",
-                    "mixHash" : "0x5ee65116b150d0973451d76157fd3e7d31860b1e94d426680b6aab802d06b45a",
-                    "nonce" : "0x4e7dfd4f7b22c95a",
+                    "hash" : "0xec510195b335529881f36a3ab1858d8996bad53949e6d41293dcc92c43b017d9",
+                    "mixHash" : "0x7500fc7ba9c11eb44df5ca97e31c7d21d5533e0a2344641315eb63167a3ba177",
+                    "nonce" : "0x91048d6e72aeb030",
                     "number" : "0x01",
                     "parentHash" : "0x83a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5",
-                    "receiptTrie" : "0xd8f57081f4ea2813a4f6b446d5a5b7600495c52ae075cfaebc8ae4d3f116e2e8",
-                    "stateRoot" : "0xd41f67158a32f0954f556b649bb88760bdc5777b6c1c74b5243adf5b37a6e4ac",
+                    "receiptTrie" : "0xb535351083676540f6e5a48ce33e9392db230fd69503668c0b84d18b8226cacd",
+                    "stateRoot" : "0x02a2132f2614dee5ca8075a321898edbf37a86810c00cd33edc3dabd3988a50d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d41f67158a32f0954f556b649bb88760bdc5777b6c1c74b5243adf5b37a6e4aca09cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57a0d8f57081f4ea2813a4f6b446d5a5b7600495c52ae075cfaebc8ae4d3f116e2e8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830236688203e880a05ee65116b150d0973451d76157fd3e7d31860b1e94d426680b6aab802d06b45a884e7dfd4f7b22c95af866f86480018302366894a0000000000000000000000000000000000000008084c04062261ca00732ad0b6c7efd9b1cd2d1dba4835fc97621a2a9a684a1d78842d19a2ebe7d5aa04c5a1223779d015f2c0c4fa197264b30db097dde85b2dc4e758a7bf2d6bd2ec5c0",
+                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa002a2132f2614dee5ca8075a321898edbf37a86810c00cd33edc3dabd3988a50da09cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57a0b535351083676540f6e5a48ce33e9392db230fd69503668c0b84d18b8226cacdb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830236688203e880a07500fc7ba9c11eb44df5ca97e31c7d21d5533e0a2344641315eb63167a3ba1778891048d6e72aeb030f866f86480018302366894a0000000000000000000000000000000000000008084c04062261ca00732ad0b6c7efd9b1cd2d1dba4835fc97621a2a9a684a1d78842d19a2ebe7d5aa04c5a1223779d015f2c0c4fa197264b30db097dde85b2dc4e758a7bf2d6bd2ec5c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bc0c1a44714a77c5ea1e838c9f03a3c998a763b021c99c1add2b60aa9147547a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x622c94198e2020762f76593f8e79bcd3ecafa502dcbaebbc07a7266de7fb3cd7",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xec510195b335529881f36a3ab1858d8996bad53949e6d41293dcc92c43b017d9",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f63668",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c414610049578063c040622614610058575b610000565b346100005761005661007f565b005b346100005761006561008a565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b6000600060405161016f8061016b833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff166373027f6d306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b156100005760325a03f11561000057505050600d600081905550600e600181905550600191505b50905600606060405234610000575b610156806100196000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a723058201d40a4f4ab84c9ed5c1e6f9e4574875993931efb14de8c4fc6be556ceeef5cc20029a165627a7a72305820b3260ed34e660b9533216c5881783a6cc70a072f3dc8d26e835c4d14c3c2a7890029",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2d998",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c414610049578063c040622614610058575b610000565b346100005761005661007f565b005b346100005761006561008a565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b6000600060405161016f8061016b833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff166373027f6d306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b156100005760325a03f11561000057505050600d600081905550600e600181905550600191505b50905600606060405234610000575b610156806100196000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a723058201d40a4f4ab84c9ed5c1e6f9e4574875993931efb14de8c4fc6be556ceeef5cc20029a165627a7a72305820b3260ed34e660b9533216c5881783a6cc70a072f3dc8d26e835c4d14c3c2a7890029",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertRemoteSubCallStorageOOG2_d0g2v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG2_d0g2v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x023668",
+                    "hash" : "0x95c82a982747feac7bb609ff0e806831585bb9acf51f869760c2dd0a3f148440",
+                    "mixHash" : "0x9259bd5c9148887a98e25f41a1c1748b7469c2409c6aa74545d2bb51fece0fbd",
+                    "nonce" : "0x4f35296786b610d1",
+                    "number" : "0x01",
+                    "parentHash" : "0x83a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5",
+                    "receiptTrie" : "0xb535351083676540f6e5a48ce33e9392db230fd69503668c0b84d18b8226cacd",
+                    "stateRoot" : "0x02a2132f2614dee5ca8075a321898edbf37a86810c00cd33edc3dabd3988a50d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901f8a083a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa002a2132f2614dee5ca8075a321898edbf37a86810c00cd33edc3dabd3988a50da09cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57a0b535351083676540f6e5a48ce33e9392db230fd69503668c0b84d18b8226cacdb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830236688203e880a09259bd5c9148887a98e25f41a1c1748b7469c2409c6aa74545d2bb51fece0fbd884f35296786b610d1f866f86480018302366894a0000000000000000000000000000000000000008084c04062261ca00732ad0b6c7efd9b1cd2d1dba4835fc97621a2a9a684a1d78842d19a2ebe7d5aa04c5a1223779d015f2c0c4fa197264b30db097dde85b2dc4e758a7bf2d6bd2ec5c0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x023668",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0732ad0b6c7efd9b1cd2d1dba4835fc97621a2a9a684a1d78842d19a2ebe7d5a",
+                        "s" : "0x4c5a1223779d015f2c0c4fa197264b30db097dde85b2dc4e758a7bf2d6bd2ec5",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x83a516ced57b620161d5b5339079594d87621f7788d06e4051bbbed66bbbb6e5",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2bc0c1a44714a77c5ea1e838c9f03a3c998a763b021c99c1add2b60aa9147547",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bc0c1a44714a77c5ea1e838c9f03a3c998a763b021c99c1add2b60aa9147547a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x95c82a982747feac7bb609ff0e806831585bb9acf51f869760c2dd0a3f148440",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f63668",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG_d0g0v0.json
index 942fe5ea0..286af6059 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertRemoteSubCallStorageOOG_d0g0v0_EIP150" : {
+    "RevertRemoteSubCallStorageOOG_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/stRevertTest/RevertRemoteSubCallStorageOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x024220",
-                    "hash" : "0x07d38e31fa791dfc23566573e929f87a9dbd3fe401bb6904fabf973be49c2832",
-                    "mixHash" : "0xf57f6c3883c2842a8549d11c5b1b9851a1379d46bb7bbae0b90607a75a7bc707",
-                    "nonce" : "0x097ac27a0be4e3c8",
+                    "hash" : "0x72ffeef75fa0e3c7ac9565038f3cc6c033d3712641064c91e8556a5c31408719",
+                    "mixHash" : "0xd3b367e1f489b78ab800afc235dbfad39b21c7458e16192ea00b556dfa80de37",
+                    "nonce" : "0x53446ce66e0a6e02",
                     "number" : "0x01",
                     "parentHash" : "0x3a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18",
-                    "receiptTrie" : "0x27104b6afac5f6bbaa388cb771197771264949457f33b7d711235645f44b4aad",
-                    "stateRoot" : "0xbf5cd38e9f70714769242474d44b55846264f7fd57e86c48fd6c00d6272132ac",
+                    "receiptTrie" : "0x128afbcf6bde7e0164568e5ad40b1e5678a76e398b26ebaa4a064adf19729d8a",
+                    "stateRoot" : "0xd0e4f6a2a111115873ae15636c297dfe13d423e4c3025a37183d3d578cdb6d59",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74847272d7128fd10884ac695d167fd08814d11b19a6ffa3dd3cf0450905a01e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf5cd38e9f70714769242474d44b55846264f7fd57e86c48fd6c00d6272132aca074847272d7128fd10884ac695d167fd08814d11b19a6ffa3dd3cf0450905a01ea027104b6afac5f6bbaa388cb771197771264949457f33b7d711235645f44b4aadb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830242208203e880a0f57f6c3883c2842a8549d11c5b1b9851a1379d46bb7bbae0b90607a75a7bc70788097ac27a0be4e3c8f866f86480018302422094a0000000000000000000000000000000000000008084c04062261ca094ef4edd5e137623b9413897543e1af8bb57edff25d3d2f40a684ccb7376b57aa0506824c3d8964004b8773fe8ad9f7212428b83002a65b060f8103bcd29274691c0",
+                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0e4f6a2a111115873ae15636c297dfe13d423e4c3025a37183d3d578cdb6d59a074847272d7128fd10884ac695d167fd08814d11b19a6ffa3dd3cf0450905a01ea0128afbcf6bde7e0164568e5ad40b1e5678a76e398b26ebaa4a064adf19729d8ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830242208203e880a0d3b367e1f489b78ab800afc235dbfad39b21c7458e16192ea00b556dfa80de378853446ce66e0a6e02f866f86480018302422094a0000000000000000000000000000000000000008084c04062261ca094ef4edd5e137623b9413897543e1af8bb57edff25d3d2f40a684ccb7376b57aa0506824c3d8964004b8773fe8ad9f7212428b83002a65b060f8103bcd29274691c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027e301526d6c628f31e2d8c3a886baf14d5b8bbfc388e70185afeac73fdb323ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x07d38e31fa791dfc23566573e929f87a9dbd3fe401bb6904fabf973be49c2832",
-        "network" : "EIP150",
+        "lastblockhash" : "0x72ffeef75fa0e3c7ac9565038f3cc6c033d3712641064c91e8556a5c31408719",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f64220",
                 "code" : "",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "RevertRemoteSubCallStorageOOG_d0g0v0_EIP158" : {
+    "RevertRemoteSubCallStorageOOG_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/stRevertTest/RevertRemoteSubCallStorageOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x024220",
-                    "hash" : "0xf5e3f11c1df15a483a71e7686358aa15272b0120fe2f99b45f7a8972f77d37e4",
-                    "mixHash" : "0x04e9a5d0e4377c5dd786fb4ccc69eadc8d20994d32291207074ed6067b1f48c8",
-                    "nonce" : "0x3205e1249f2d9e91",
+                    "hash" : "0x7db7ffcd76daebb20a654acfdb392c51a25da25dd8648895425fb6c095bbef3a",
+                    "mixHash" : "0x271eb44d9d1f0d3a7dda1976b190da0581ffcf185819ebc8bf3457e91a81d676",
+                    "nonce" : "0x8bd92311d56f07c2",
                     "number" : "0x01",
                     "parentHash" : "0x3a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18",
-                    "receiptTrie" : "0x27104b6afac5f6bbaa388cb771197771264949457f33b7d711235645f44b4aad",
-                    "stateRoot" : "0xbf5cd38e9f70714769242474d44b55846264f7fd57e86c48fd6c00d6272132ac",
+                    "receiptTrie" : "0x128afbcf6bde7e0164568e5ad40b1e5678a76e398b26ebaa4a064adf19729d8a",
+                    "stateRoot" : "0xd0e4f6a2a111115873ae15636c297dfe13d423e4c3025a37183d3d578cdb6d59",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74847272d7128fd10884ac695d167fd08814d11b19a6ffa3dd3cf0450905a01e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf5cd38e9f70714769242474d44b55846264f7fd57e86c48fd6c00d6272132aca074847272d7128fd10884ac695d167fd08814d11b19a6ffa3dd3cf0450905a01ea027104b6afac5f6bbaa388cb771197771264949457f33b7d711235645f44b4aadb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830242208203e880a004e9a5d0e4377c5dd786fb4ccc69eadc8d20994d32291207074ed6067b1f48c8883205e1249f2d9e91f866f86480018302422094a0000000000000000000000000000000000000008084c04062261ca094ef4edd5e137623b9413897543e1af8bb57edff25d3d2f40a684ccb7376b57aa0506824c3d8964004b8773fe8ad9f7212428b83002a65b060f8103bcd29274691c0",
+                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0e4f6a2a111115873ae15636c297dfe13d423e4c3025a37183d3d578cdb6d59a074847272d7128fd10884ac695d167fd08814d11b19a6ffa3dd3cf0450905a01ea0128afbcf6bde7e0164568e5ad40b1e5678a76e398b26ebaa4a064adf19729d8ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830242208203e880a0271eb44d9d1f0d3a7dda1976b190da0581ffcf185819ebc8bf3457e91a81d676888bd92311d56f07c2f866f86480018302422094a0000000000000000000000000000000000000008084c04062261ca094ef4edd5e137623b9413897543e1af8bb57edff25d3d2f40a684ccb7376b57aa0506824c3d8964004b8773fe8ad9f7212428b83002a65b060f8103bcd29274691c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027e301526d6c628f31e2d8c3a886baf14d5b8bbfc388e70185afeac73fdb323ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf5e3f11c1df15a483a71e7686358aa15272b0120fe2f99b45f7a8972f77d37e4",
-        "network" : "EIP158",
+        "lastblockhash" : "0x7db7ffcd76daebb20a654acfdb392c51a25da25dd8648895425fb6c095bbef3a",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f64220",
                 "code" : "",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "RevertRemoteSubCallStorageOOG_d0g0v0_Frontier" : {
+    "RevertRemoteSubCallStorageOOG_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/stRevertTest/RevertRemoteSubCallStorageOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -223,19 +237,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x022f19",
-                    "hash" : "0x1edd36b5786038500efb96d4a65f19426cbc2bd6a37596e7611647a2a150b127",
-                    "mixHash" : "0x3e968bb296856c2b10c1f358b58b1fc9f23556f0d006d583c8f8bac040d8cdb1",
-                    "nonce" : "0x13973c9927a71f7f",
+                    "gasUsed" : "0x024220",
+                    "hash" : "0xe8288c27c3e3d5c5bd5d961bd454d0cc2eeee6efa706987f8cb8cc420fac301a",
+                    "mixHash" : "0xa8f8d11f7b5768137f53656bbd33430a0fc180c4b7bf5d46eccab657df141c1e",
+                    "nonce" : "0xe35a9db81bbf1179",
                     "number" : "0x01",
                     "parentHash" : "0x3a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18",
-                    "receiptTrie" : "0x93de08b19661cfc2f047e267c76a35b71e2a9e53cd747c6f187bbccf068c97cc",
-                    "stateRoot" : "0x3c5f29d526983e8fa555dc763a7722505f2a775bf53ca3e6b8dbc81072da407e",
+                    "receiptTrie" : "0x27104b6afac5f6bbaa388cb771197771264949457f33b7d711235645f44b4aad",
+                    "stateRoot" : "0xbf5cd38e9f70714769242474d44b55846264f7fd57e86c48fd6c00d6272132ac",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74847272d7128fd10884ac695d167fd08814d11b19a6ffa3dd3cf0450905a01e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c5f29d526983e8fa555dc763a7722505f2a775bf53ca3e6b8dbc81072da407ea074847272d7128fd10884ac695d167fd08814d11b19a6ffa3dd3cf0450905a01ea093de08b19661cfc2f047e267c76a35b71e2a9e53cd747c6f187bbccf068c97ccb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083022f198203e880a03e968bb296856c2b10c1f358b58b1fc9f23556f0d006d583c8f8bac040d8cdb18813973c9927a71f7ff866f86480018302422094a0000000000000000000000000000000000000008084c04062261ca094ef4edd5e137623b9413897543e1af8bb57edff25d3d2f40a684ccb7376b57aa0506824c3d8964004b8773fe8ad9f7212428b83002a65b060f8103bcd29274691c0",
+                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf5cd38e9f70714769242474d44b55846264f7fd57e86c48fd6c00d6272132aca074847272d7128fd10884ac695d167fd08814d11b19a6ffa3dd3cf0450905a01ea027104b6afac5f6bbaa388cb771197771264949457f33b7d711235645f44b4aadb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830242208203e880a0a8f8d11f7b5768137f53656bbd33430a0fc180c4b7bf5d46eccab657df141c1e88e35a9db81bbf1179f866f86480018302422094a0000000000000000000000000000000000000008084c04062261ca094ef4edd5e137623b9413897543e1af8bb57edff25d3d2f40a684ccb7376b57aa0506824c3d8964004b8773fe8ad9f7212428b83002a65b060f8103bcd29274691c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -272,33 +286,130 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027e301526d6c628f31e2d8c3a886baf14d5b8bbfc388e70185afeac73fdb323ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1edd36b5786038500efb96d4a65f19426cbc2bd6a37596e7611647a2a150b127",
-        "network" : "Frontier",
+        "lastblockhash" : "0xe8288c27c3e3d5c5bd5d961bd454d0cc2eeee6efa706987f8cb8cc420fac301a",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f62f19",
+                "balance" : "0x4563918244f64220",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
-                "balance" : "0x00",
-                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a72305820db9c9d1f37fd36768131a0bf9687f465e15b0503452e603be6b6f07b70d72e260029",
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c414610049578063c040622614610058575b610000565b346100005761005661007f565b005b346100005761006561008a565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b6000600060405161016f80610163833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff166373027f6d306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b156100005760325a03f11561000057505050600d600181905550600191505b50905600606060405234610000575b610156806100196000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a72305820db9c9d1f37fd36768131a0bf9687f465e15b0503452e603be6b6f07b70d72e260029a165627a7a72305820f8ff2f7feef24d01a1cc070e67db9e15ac34810c8e5d1c7f34f3c38148eeae900029",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2cde0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
             "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x01",
                 "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c414610049578063c040622614610058575b610000565b346100005761005661007f565b005b346100005761006561008a565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b6000600060405161016f80610163833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff166373027f6d306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b156100005760325a03f11561000057505050600d600181905550600191505b50905600606060405234610000575b610156806100196000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a72305820db9c9d1f37fd36768131a0bf9687f465e15b0503452e603be6b6f07b70d72e260029a165627a7a72305820f8ff2f7feef24d01a1cc070e67db9e15ac34810c8e5d1c7f34f3c38148eeae900029",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x0d"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2e0e7",
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertRemoteSubCallStorageOOG_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x024220",
+                    "hash" : "0xadf68704055bea0fdb1cfafdd1b5a0fef96754af9a3eb855f45da750dabf5a35",
+                    "mixHash" : "0x180571d36686d15f7b6ec3db52a2cfd20cfbcf43fc012175059a4585cd0e396c",
+                    "nonce" : "0x13e25f53c390672c",
+                    "number" : "0x01",
+                    "parentHash" : "0x3a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18",
+                    "receiptTrie" : "0x27104b6afac5f6bbaa388cb771197771264949457f33b7d711235645f44b4aad",
+                    "stateRoot" : "0xbf5cd38e9f70714769242474d44b55846264f7fd57e86c48fd6c00d6272132ac",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x74847272d7128fd10884ac695d167fd08814d11b19a6ffa3dd3cf0450905a01e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf5cd38e9f70714769242474d44b55846264f7fd57e86c48fd6c00d6272132aca074847272d7128fd10884ac695d167fd08814d11b19a6ffa3dd3cf0450905a01ea027104b6afac5f6bbaa388cb771197771264949457f33b7d711235645f44b4aadb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830242208203e880a0180571d36686d15f7b6ec3db52a2cfd20cfbcf43fc012175059a4585cd0e396c8813e25f53c390672cf866f86480018302422094a0000000000000000000000000000000000000008084c04062261ca094ef4edd5e137623b9413897543e1af8bb57edff25d3d2f40a684ccb7376b57aa0506824c3d8964004b8773fe8ad9f7212428b83002a65b060f8103bcd29274691c0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x024220",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x94ef4edd5e137623b9413897543e1af8bb57edff25d3d2f40a684ccb7376b57a",
+                        "s" : "0x506824c3d8964004b8773fe8ad9f7212428b83002a65b060f8103bcd29274691",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x27e301526d6c628f31e2d8c3a886baf14d5b8bbfc388e70185afeac73fdb323b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027e301526d6c628f31e2d8c3a886baf14d5b8bbfc388e70185afeac73fdb323ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xadf68704055bea0fdb1cfafdd1b5a0fef96754af9a3eb855f45da750dabf5a35",
+        "network" : "EIP158",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f64220",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c414610049578063c040622614610058575b610000565b346100005761005661007f565b005b346100005761006561008a565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b6000600060405161016f80610163833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff166373027f6d306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b156100005760325a03f11561000057505050600d600181905550600191505b50905600606060405234610000575b610156806100196000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a72305820db9c9d1f37fd36768131a0bf9687f465e15b0503452e603be6b6f07b70d72e260029a165627a7a72305820f8ff2f7feef24d01a1cc070e67db9e15ac34810c8e5d1c7f34f3c38148eeae900029",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2cde0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -322,10 +433,10 @@
             }
         }
     },
-    "RevertRemoteSubCallStorageOOG_d0g0v0_Homestead" : {
+    "RevertRemoteSubCallStorageOOG_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/stRevertTest/RevertRemoteSubCallStorageOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -337,9 +448,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x022f19",
-                    "hash" : "0x80b24b73421d948e26672e49d8521dd06fb407804091239f105fd6d822d094fd",
-                    "mixHash" : "0x52f543be7712bb691dc660794b9b28005af6923915d6595141e2c9c26578cd62",
-                    "nonce" : "0x2166a5d0b14ef4ae",
+                    "hash" : "0xc3cd7128007d56772f9f685b8ba6cea8ea01c4770939ea7767973cadb35a64f6",
+                    "mixHash" : "0x9cb269fa01b844b08055a6aa8531c536add5c60b9b6fe5245455ce21c19c509f",
+                    "nonce" : "0x3d375fc8cc60839b",
                     "number" : "0x01",
                     "parentHash" : "0x3a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18",
                     "receiptTrie" : "0x93de08b19661cfc2f047e267c76a35b71e2a9e53cd747c6f187bbccf068c97cc",
@@ -348,7 +459,7 @@
                     "transactionsTrie" : "0x74847272d7128fd10884ac695d167fd08814d11b19a6ffa3dd3cf0450905a01e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c5f29d526983e8fa555dc763a7722505f2a775bf53ca3e6b8dbc81072da407ea074847272d7128fd10884ac695d167fd08814d11b19a6ffa3dd3cf0450905a01ea093de08b19661cfc2f047e267c76a35b71e2a9e53cd747c6f187bbccf068c97ccb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083022f198203e880a052f543be7712bb691dc660794b9b28005af6923915d6595141e2c9c26578cd62882166a5d0b14ef4aef866f86480018302422094a0000000000000000000000000000000000000008084c04062261ca094ef4edd5e137623b9413897543e1af8bb57edff25d3d2f40a684ccb7376b57aa0506824c3d8964004b8773fe8ad9f7212428b83002a65b060f8103bcd29274691c0",
+                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c5f29d526983e8fa555dc763a7722505f2a775bf53ca3e6b8dbc81072da407ea074847272d7128fd10884ac695d167fd08814d11b19a6ffa3dd3cf0450905a01ea093de08b19661cfc2f047e267c76a35b71e2a9e53cd747c6f187bbccf068c97ccb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083022f198203e880a09cb269fa01b844b08055a6aa8531c536add5c60b9b6fe5245455ce21c19c509f883d375fc8cc60839bf866f86480018302422094a0000000000000000000000000000000000000008084c04062261ca094ef4edd5e137623b9413897543e1af8bb57edff25d3d2f40a684ccb7376b57aa0506824c3d8964004b8773fe8ad9f7212428b83002a65b060f8103bcd29274691c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -385,8 +496,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027e301526d6c628f31e2d8c3a886baf14d5b8bbfc388e70185afeac73fdb323ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x80b24b73421d948e26672e49d8521dd06fb407804091239f105fd6d822d094fd",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc3cd7128007d56772f9f685b8ba6cea8ea01c4770939ea7767973cadb35a64f6",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f62f19",
@@ -435,10 +546,10 @@
             }
         }
     },
-    "RevertRemoteSubCallStorageOOG_d0g0v0_Metropolis" : {
+    "RevertRemoteSubCallStorageOOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -449,19 +560,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x024220",
-                    "hash" : "0xc0530c5190c4c8878cac47852fde9d74390c8a44f10a465e65b74b532259c98c",
-                    "mixHash" : "0x690df7f30a8a29a87a6d1be95f110a52133b22a4b5f5f0a6f9ee0003ff139650",
-                    "nonce" : "0x2cea5bf7244ae991",
+                    "gasUsed" : "0x022f19",
+                    "hash" : "0x60e20838a34c6bec9aa133ebcd17bda19c8bad91f25dee94dc3af8f6d1af08d0",
+                    "mixHash" : "0x0aac961c6c85b304bb7c592b918cd2ea6d3effa7d59d8a7121ff45abb6b6c7a6",
+                    "nonce" : "0xfb80446708552513",
                     "number" : "0x01",
                     "parentHash" : "0x3a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18",
-                    "receiptTrie" : "0x128afbcf6bde7e0164568e5ad40b1e5678a76e398b26ebaa4a064adf19729d8a",
-                    "stateRoot" : "0xd0e4f6a2a111115873ae15636c297dfe13d423e4c3025a37183d3d578cdb6d59",
+                    "receiptTrie" : "0x93de08b19661cfc2f047e267c76a35b71e2a9e53cd747c6f187bbccf068c97cc",
+                    "stateRoot" : "0x3c5f29d526983e8fa555dc763a7722505f2a775bf53ca3e6b8dbc81072da407e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74847272d7128fd10884ac695d167fd08814d11b19a6ffa3dd3cf0450905a01e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0e4f6a2a111115873ae15636c297dfe13d423e4c3025a37183d3d578cdb6d59a074847272d7128fd10884ac695d167fd08814d11b19a6ffa3dd3cf0450905a01ea0128afbcf6bde7e0164568e5ad40b1e5678a76e398b26ebaa4a064adf19729d8ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830242208203e880a0690df7f30a8a29a87a6d1be95f110a52133b22a4b5f5f0a6f9ee0003ff139650882cea5bf7244ae991f866f86480018302422094a0000000000000000000000000000000000000008084c04062261ca094ef4edd5e137623b9413897543e1af8bb57edff25d3d2f40a684ccb7376b57aa0506824c3d8964004b8773fe8ad9f7212428b83002a65b060f8103bcd29274691c0",
+                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c5f29d526983e8fa555dc763a7722505f2a775bf53ca3e6b8dbc81072da407ea074847272d7128fd10884ac695d167fd08814d11b19a6ffa3dd3cf0450905a01ea093de08b19661cfc2f047e267c76a35b71e2a9e53cd747c6f187bbccf068c97ccb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083022f198203e880a00aac961c6c85b304bb7c592b918cd2ea6d3effa7d59d8a7121ff45abb6b6c7a688fb80446708552513f866f86480018302422094a0000000000000000000000000000000000000008084c04062261ca094ef4edd5e137623b9413897543e1af8bb57edff25d3d2f40a684ccb7376b57aa0506824c3d8964004b8773fe8ad9f7212428b83002a65b060f8103bcd29274691c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -498,19 +609,19 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027e301526d6c628f31e2d8c3a886baf14d5b8bbfc388e70185afeac73fdb323ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc0530c5190c4c8878cac47852fde9d74390c8a44f10a465e65b74b532259c98c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x60e20838a34c6bec9aa133ebcd17bda19c8bad91f25dee94dc3af8f6d1af08d0",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f62f19",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f64220",
-                "code" : "",
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
+                "balance" : "0x00",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a72305820db9c9d1f37fd36768131a0bf9687f465e15b0503452e603be6b6f07b70d72e260029",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -518,12 +629,13 @@
             "0xa000000000000000000000000000000000000000" : {
                 "balance" : "0x01",
                 "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c414610049578063c040622614610058575b610000565b346100005761005661007f565b005b346100005761006561008a565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b6000600060405161016f80610163833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff166373027f6d306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b156100005760325a03f11561000057505050600d600181905550600191505b50905600606060405234610000575b610156806100196000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a72305820db9c9d1f37fd36768131a0bf9687f465e15b0503452e603be6b6f07b70d72e260029a165627a7a72305820f8ff2f7feef24d01a1cc070e67db9e15ac34810c8e5d1c7f34f3c38148eeae900029",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
+                    "0x01" : "0x0d"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a2cde0",
+                "balance" : "0xe8d4a2e0e7",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG_d0g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG_d0g1v0.json
index 84516d428..a58eb95b5 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertRemoteSubCallStorageOOG_d0g1v0_EIP150" : {
+    "RevertRemoteSubCallStorageOOG_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02840c",
-                    "hash" : "0xbd4543bc29c1c779ff14c0587f4767bce4966bddb39db8d2dd838ac95d48a06c",
-                    "mixHash" : "0x1cb09b56ff1aace6b64351c56a5cf3bfdf400c45d08954b8e0e681b9de0a8125",
-                    "nonce" : "0xe4cf5b57350df5e5",
+                    "hash" : "0xfdc14e230547d7ba39ce9d8daacde0cd4c4aa1fba769fce86807127539911a2f",
+                    "mixHash" : "0x9fc30b3226b41d24dccb236b1e3ba0401e62aa064347428888b83d50841415bb",
+                    "nonce" : "0x1892728821e4f2d6",
                     "number" : "0x01",
                     "parentHash" : "0x3a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18",
-                    "receiptTrie" : "0xbe090c1b84541b5239a91f007d6624474b978870a11e8935be67573355fda356",
-                    "stateRoot" : "0x41bb7d06cf1de26b27e79f5ace6f95e0335295a1d8671312ea23b3830d60ade7",
+                    "receiptTrie" : "0xb32d7e76f68ecd3ee94be14294fe4fdeb6f6b056ae26c67abd2d6e46a32128e7",
+                    "stateRoot" : "0xa58b9a0621302221ca9c02eca9c9d524c674c55275ede9112db04d90eb1ef17f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041bb7d06cf1de26b27e79f5ace6f95e0335295a1d8671312ea23b3830d60ade7a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0be090c1b84541b5239a91f007d6624474b978870a11e8935be67573355fda356b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302840c8203e880a01cb09b56ff1aace6b64351c56a5cf3bfdf400c45d08954b8e0e681b9de0a812588e4cf5b57350df5e5f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a58b9a0621302221ca9c02eca9c9d524c674c55275ede9112db04d90eb1ef17fa00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0b32d7e76f68ecd3ee94be14294fe4fdeb6f6b056ae26c67abd2d6e46a32128e7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302840c8203e880a09fc30b3226b41d24dccb236b1e3ba0401e62aa064347428888b83d50841415bb881892728821e4f2d6f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027e301526d6c628f31e2d8c3a886baf14d5b8bbfc388e70185afeac73fdb323ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbd4543bc29c1c779ff14c0587f4767bce4966bddb39db8d2dd838ac95d48a06c",
-        "network" : "EIP150",
+        "lastblockhash" : "0xfdc14e230547d7ba39ce9d8daacde0cd4c4aa1fba769fce86807127539911a2f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6840c",
                 "code" : "",
@@ -75,7 +82,7 @@
             "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x00",
                 "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a72305820db9c9d1f37fd36768131a0bf9687f465e15b0503452e603be6b6f07b70d72e260029",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             },
@@ -113,10 +120,10 @@
             }
         }
     },
-    "RevertRemoteSubCallStorageOOG_d0g1v0_EIP158" : {
+    "RevertRemoteSubCallStorageOOG_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +135,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02840c",
-                    "hash" : "0x58090628f2edbe5804c4f0e30d29bb8fd6c8b7df318f64acb0b7826bc123c068",
-                    "mixHash" : "0x783adc1adcd31b9d4900e59c3277405386ccd4d0c59919f86117c68d148c4809",
-                    "nonce" : "0x60cc8c83d9ce83d8",
+                    "hash" : "0x614037bb06d7967ab7f3ac0fea9a6617c6e64307215849d6c39e3e034dd18bdd",
+                    "mixHash" : "0x30b515c20a29392e03b2de0b329b8fba2557cdacdc94100c7996940cb11e75be",
+                    "nonce" : "0x12c0162721670ea1",
                     "number" : "0x01",
                     "parentHash" : "0x3a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18",
-                    "receiptTrie" : "0xc063e401caabf4da2c6e07c524189178eb27c5a2dc8e6e525835d6fce42da045",
-                    "stateRoot" : "0x4fa5f978ab4b08989ea609e5360e9c54721b535e381f8eb2308cc3d9d4a3a9c4",
+                    "receiptTrie" : "0xb32d7e76f68ecd3ee94be14294fe4fdeb6f6b056ae26c67abd2d6e46a32128e7",
+                    "stateRoot" : "0xa58b9a0621302221ca9c02eca9c9d524c674c55275ede9112db04d90eb1ef17f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04fa5f978ab4b08989ea609e5360e9c54721b535e381f8eb2308cc3d9d4a3a9c4a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0c063e401caabf4da2c6e07c524189178eb27c5a2dc8e6e525835d6fce42da045b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302840c8203e880a0783adc1adcd31b9d4900e59c3277405386ccd4d0c59919f86117c68d148c48098860cc8c83d9ce83d8f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a58b9a0621302221ca9c02eca9c9d524c674c55275ede9112db04d90eb1ef17fa00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0b32d7e76f68ecd3ee94be14294fe4fdeb6f6b056ae26c67abd2d6e46a32128e7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302840c8203e880a030b515c20a29392e03b2de0b329b8fba2557cdacdc94100c7996940cb11e75be8812c0162721670ea1f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -176,9 +183,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027e301526d6c628f31e2d8c3a886baf14d5b8bbfc388e70185afeac73fdb323ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x58090628f2edbe5804c4f0e30d29bb8fd6c8b7df318f64acb0b7826bc123c068",
-        "network" : "EIP158",
+        "lastblockhash" : "0x614037bb06d7967ab7f3ac0fea9a6617c6e64307215849d6c39e3e034dd18bdd",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6840c",
                 "code" : "",
@@ -227,10 +241,10 @@
             }
         }
     },
-    "RevertRemoteSubCallStorageOOG_d0g1v0_Frontier" : {
+    "RevertRemoteSubCallStorageOOG_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -241,19 +255,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x027c3c",
-                    "hash" : "0xe2f9bb98331ee5237b5b4720efa9800984c8eef070a31295cd470b2afbcebdee",
-                    "mixHash" : "0x163e17cd0123053a165c56d59a8acd9e95a6d19d51a5ffe8f9d88d85f9be9593",
-                    "nonce" : "0x3aea3557079b2ae1",
+                    "gasUsed" : "0x02840c",
+                    "hash" : "0x7138138d61ae47f641079772d1ace0b1baf12309933b367e3b754f53a69bbdd8",
+                    "mixHash" : "0xca273362c0fde5a27304a2ca0bc0f09191e5c184aed5aeafc6432b1992a8cc32",
+                    "nonce" : "0xd655f33942226e73",
                     "number" : "0x01",
                     "parentHash" : "0x3a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18",
-                    "receiptTrie" : "0xb3ed43601343edc0ffd23ab299e5a44bc5a94ecf3eae4ecc6b929760eba21623",
-                    "stateRoot" : "0x7aeb4f53cb97ac3693bf509074a4e426a72c0dc1c184bb01e5ac25417e6b2f8e",
+                    "receiptTrie" : "0xbe090c1b84541b5239a91f007d6624474b978870a11e8935be67573355fda356",
+                    "stateRoot" : "0x41bb7d06cf1de26b27e79f5ace6f95e0335295a1d8671312ea23b3830d60ade7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07aeb4f53cb97ac3693bf509074a4e426a72c0dc1c184bb01e5ac25417e6b2f8ea00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0b3ed43601343edc0ffd23ab299e5a44bc5a94ecf3eae4ecc6b929760eba21623b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083027c3c8203e880a0163e17cd0123053a165c56d59a8acd9e95a6d19d51a5ffe8f9d88d85f9be9593883aea3557079b2ae1f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041bb7d06cf1de26b27e79f5ace6f95e0335295a1d8671312ea23b3830d60ade7a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0be090c1b84541b5239a91f007d6624474b978870a11e8935be67573355fda356b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302840c8203e880a0ca273362c0fde5a27304a2ca0bc0f09191e5c184aed5aeafc6432b1992a8cc3288d655f33942226e73f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -290,11 +304,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027e301526d6c628f31e2d8c3a886baf14d5b8bbfc388e70185afeac73fdb323ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe2f9bb98331ee5237b5b4720efa9800984c8eef070a31295cd470b2afbcebdee",
-        "network" : "Frontier",
+        "lastblockhash" : "0x7138138d61ae47f641079772d1ace0b1baf12309933b367e3b754f53a69bbdd8",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f67c3c",
+                "balance" : "0x4563918244f6840c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -317,7 +331,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a293c4",
+                "balance" : "0xe8d4a28bf4",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -341,10 +355,10 @@
             }
         }
     },
-    "RevertRemoteSubCallStorageOOG_d0g1v0_Homestead" : {
+    "RevertRemoteSubCallStorageOOG_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -355,19 +369,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x027c3c",
-                    "hash" : "0x432b3200de6933987dbfb083b51cf486464616fbe286c0376f584cf9ea9504db",
-                    "mixHash" : "0x500488f773c2dba9226f41c3fec6ec12234d2d8add586536e2e6415b3ec73103",
-                    "nonce" : "0x2c2f1e710049c4ea",
+                    "gasUsed" : "0x02840c",
+                    "hash" : "0xb312bdd2299837ad86b65ed7e303a1b15c7778f7a1166c8248ddb1ec5edac64f",
+                    "mixHash" : "0x0535b358aa4b95b9584f1e96ccc0e65748eb438aac061ae40b0a78534af8b582",
+                    "nonce" : "0xb2f01bd9a952e4b7",
                     "number" : "0x01",
                     "parentHash" : "0x3a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18",
-                    "receiptTrie" : "0xb3ed43601343edc0ffd23ab299e5a44bc5a94ecf3eae4ecc6b929760eba21623",
-                    "stateRoot" : "0x7aeb4f53cb97ac3693bf509074a4e426a72c0dc1c184bb01e5ac25417e6b2f8e",
+                    "receiptTrie" : "0xc063e401caabf4da2c6e07c524189178eb27c5a2dc8e6e525835d6fce42da045",
+                    "stateRoot" : "0x4fa5f978ab4b08989ea609e5360e9c54721b535e381f8eb2308cc3d9d4a3a9c4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07aeb4f53cb97ac3693bf509074a4e426a72c0dc1c184bb01e5ac25417e6b2f8ea00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0b3ed43601343edc0ffd23ab299e5a44bc5a94ecf3eae4ecc6b929760eba21623b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083027c3c8203e880a0500488f773c2dba9226f41c3fec6ec12234d2d8add586536e2e6415b3ec73103882c2f1e710049c4eaf866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04fa5f978ab4b08989ea609e5360e9c54721b535e381f8eb2308cc3d9d4a3a9c4a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0c063e401caabf4da2c6e07c524189178eb27c5a2dc8e6e525835d6fce42da045b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302840c8203e880a00535b358aa4b95b9584f1e96ccc0e65748eb438aac061ae40b0a78534af8b58288b2f01bd9a952e4b7f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -404,11 +418,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027e301526d6c628f31e2d8c3a886baf14d5b8bbfc388e70185afeac73fdb323ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x432b3200de6933987dbfb083b51cf486464616fbe286c0376f584cf9ea9504db",
-        "network" : "Homestead",
+        "lastblockhash" : "0xb312bdd2299837ad86b65ed7e303a1b15c7778f7a1166c8248ddb1ec5edac64f",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f67c3c",
+                "balance" : "0x4563918244f6840c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -417,7 +431,7 @@
             "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x00",
                 "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a72305820db9c9d1f37fd36768131a0bf9687f465e15b0503452e603be6b6f07b70d72e260029",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             },
@@ -431,7 +445,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a293c4",
+                "balance" : "0xe8d4a28bf4",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -455,10 +469,10 @@
             }
         }
     },
-    "RevertRemoteSubCallStorageOOG_d0g1v0_Metropolis" : {
+    "RevertRemoteSubCallStorageOOG_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -469,19 +483,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x02840c",
-                    "hash" : "0xe023dc10e98d5a912d947372cebeb554c37c1eaa7cc0d987908a5971e0c9ffe7",
-                    "mixHash" : "0x7a4593a91a36a205b2e5a48b4889da70b79104f6649b4b02f4a3930a846e0ac7",
-                    "nonce" : "0x60fcf19788763024",
+                    "gasUsed" : "0x027c3c",
+                    "hash" : "0xea19058e1a78943b7a140415ffd3da82eb8f2002de1d6017b5cff8e6eff31dee",
+                    "mixHash" : "0xbce86e229a26b51c7b75d0487ad7367aab6a1ba2c1e7154881038c30a80166fe",
+                    "nonce" : "0x443d1ed4b02b61e9",
                     "number" : "0x01",
                     "parentHash" : "0x3a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18",
-                    "receiptTrie" : "0xb32d7e76f68ecd3ee94be14294fe4fdeb6f6b056ae26c67abd2d6e46a32128e7",
-                    "stateRoot" : "0xa58b9a0621302221ca9c02eca9c9d524c674c55275ede9112db04d90eb1ef17f",
+                    "receiptTrie" : "0xb3ed43601343edc0ffd23ab299e5a44bc5a94ecf3eae4ecc6b929760eba21623",
+                    "stateRoot" : "0x7aeb4f53cb97ac3693bf509074a4e426a72c0dc1c184bb01e5ac25417e6b2f8e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a58b9a0621302221ca9c02eca9c9d524c674c55275ede9112db04d90eb1ef17fa00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0b32d7e76f68ecd3ee94be14294fe4fdeb6f6b056ae26c67abd2d6e46a32128e7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302840c8203e880a07a4593a91a36a205b2e5a48b4889da70b79104f6649b4b02f4a3930a846e0ac78860fcf19788763024f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07aeb4f53cb97ac3693bf509074a4e426a72c0dc1c184bb01e5ac25417e6b2f8ea00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0b3ed43601343edc0ffd23ab299e5a44bc5a94ecf3eae4ecc6b929760eba21623b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083027c3c8203e880a0bce86e229a26b51c7b75d0487ad7367aab6a1ba2c1e7154881038c30a80166fe88443d1ed4b02b61e9f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -518,18 +532,125 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027e301526d6c628f31e2d8c3a886baf14d5b8bbfc388e70185afeac73fdb323ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe023dc10e98d5a912d947372cebeb554c37c1eaa7cc0d987908a5971e0c9ffe7",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xea19058e1a78943b7a140415ffd3da82eb8f2002de1d6017b5cff8e6eff31dee",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f67c3c",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x00",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a72305820db9c9d1f37fd36768131a0bf9687f465e15b0503452e603be6b6f07b70d72e260029",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c414610049578063c040622614610058575b610000565b346100005761005661007f565b005b346100005761006561008a565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b6000600060405161016f80610163833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff166373027f6d306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b156100005760325a03f11561000057505050600d600181905550600191505b50905600606060405234610000575b610156806100196000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a72305820db9c9d1f37fd36768131a0bf9687f465e15b0503452e603be6b6f07b70d72e260029a165627a7a72305820f8ff2f7feef24d01a1cc070e67db9e15ac34810c8e5d1c7f34f3c38148eeae900029",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x0c",
+                    "0x01" : "0x0d"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a293c4",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c414610049578063c040622614610058575b610000565b346100005761005661007f565b005b346100005761006561008a565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b6000600060405161016f80610163833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff166373027f6d306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b156100005760325a03f11561000057505050600d600181905550600191505b50905600606060405234610000575b610156806100196000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a72305820db9c9d1f37fd36768131a0bf9687f465e15b0503452e603be6b6f07b70d72e260029a165627a7a72305820f8ff2f7feef24d01a1cc070e67db9e15ac34810c8e5d1c7f34f3c38148eeae900029",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertRemoteSubCallStorageOOG_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x027c3c",
+                    "hash" : "0xd12b53aa6c9fc0aa486709861bd2b154d9c0294fc5fed6032fa786d66db3d1e2",
+                    "mixHash" : "0x2ede2d900acd674d52e4dcdc5d99b44dafd239ac4d6cc241fd88c17a9c047908",
+                    "nonce" : "0xc59e6639939b692c",
+                    "number" : "0x01",
+                    "parentHash" : "0x3a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18",
+                    "receiptTrie" : "0xb3ed43601343edc0ffd23ab299e5a44bc5a94ecf3eae4ecc6b929760eba21623",
+                    "stateRoot" : "0x7aeb4f53cb97ac3693bf509074a4e426a72c0dc1c184bb01e5ac25417e6b2f8e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07aeb4f53cb97ac3693bf509074a4e426a72c0dc1c184bb01e5ac25417e6b2f8ea00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0b3ed43601343edc0ffd23ab299e5a44bc5a94ecf3eae4ecc6b929760eba21623b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083027c3c8203e880a02ede2d900acd674d52e4dcdc5d99b44dafd239ac4d6cc241fd88c17a9c04790888c59e6639939b692cf866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x02c308",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234e",
+                        "s" : "0x28495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x27e301526d6c628f31e2d8c3a886baf14d5b8bbfc388e70185afeac73fdb323b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027e301526d6c628f31e2d8c3a886baf14d5b8bbfc388e70185afeac73fdb323ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd12b53aa6c9fc0aa486709861bd2b154d9c0294fc5fed6032fa786d66db3d1e2",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f6840c",
+                "balance" : "0x4563918244f67c3c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -538,7 +659,7 @@
             "0x7db299e0885c85039f56fa504a13dd8ce8a56aa7" : {
                 "balance" : "0x00",
                 "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a72305820db9c9d1f37fd36768131a0bf9687f465e15b0503452e603be6b6f07b70d72e260029",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
@@ -552,7 +673,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a28bf4",
+                "balance" : "0xe8d4a293c4",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG_d0g2v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG_d0g2v0.json
index 0296f0a6e..9e8b53b88 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG_d0g2v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG_d0g2v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertRemoteSubCallStorageOOG_d0g2v0_EIP150" : {
+    "RevertRemoteSubCallStorageOOG_d0g2v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG_d0g2v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x023668",
-                    "hash" : "0xeae05027226c92efe1d1b98b904e86a045857a0579879951d5ef580dc1f7d931",
-                    "mixHash" : "0xe04d065eae37d33ec13b343b75451ca27a77555e8f2b20ac23eba4e715f66a33",
-                    "nonce" : "0xa100feee0b683818",
+                    "hash" : "0x272d6d5a438050291bd88834a470b1fe3eac24ccfcb9b0ffeae7945ef6941260",
+                    "mixHash" : "0x264a1e532a9249c3d35c0243ee24ee741dc27116d00f9348f2e8170df0be199c",
+                    "nonce" : "0x44f7ff45b95f92b3",
                     "number" : "0x01",
                     "parentHash" : "0x3a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18",
-                    "receiptTrie" : "0x2d69c988c48b51b167d6ff01eabcb6de459fcc62b52957c1c85608c39fadf21f",
-                    "stateRoot" : "0xd1a28b08e36926a83eda1e7f3d0fb1eee1365080c5718a1eb9e39ecbcbaa3d8a",
+                    "receiptTrie" : "0xd8f57081f4ea2813a4f6b446d5a5b7600495c52ae075cfaebc8ae4d3f116e2e8",
+                    "stateRoot" : "0x0e958ef00004b5d17aa9fd71040e149d7f4814f48275f225f107aa2fff0a0b14",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d1a28b08e36926a83eda1e7f3d0fb1eee1365080c5718a1eb9e39ecbcbaa3d8aa09cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57a02d69c988c48b51b167d6ff01eabcb6de459fcc62b52957c1c85608c39fadf21fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830236688203e880a0e04d065eae37d33ec13b343b75451ca27a77555e8f2b20ac23eba4e715f66a3388a100feee0b683818f866f86480018302366894a0000000000000000000000000000000000000008084c04062261ca00732ad0b6c7efd9b1cd2d1dba4835fc97621a2a9a684a1d78842d19a2ebe7d5aa04c5a1223779d015f2c0c4fa197264b30db097dde85b2dc4e758a7bf2d6bd2ec5c0",
+                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e958ef00004b5d17aa9fd71040e149d7f4814f48275f225f107aa2fff0a0b14a09cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57a0d8f57081f4ea2813a4f6b446d5a5b7600495c52ae075cfaebc8ae4d3f116e2e8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830236688203e880a0264a1e532a9249c3d35c0243ee24ee741dc27116d00f9348f2e8170df0be199c8844f7ff45b95f92b3f866f86480018302366894a0000000000000000000000000000000000000008084c04062261ca00732ad0b6c7efd9b1cd2d1dba4835fc97621a2a9a684a1d78842d19a2ebe7d5aa04c5a1223779d015f2c0c4fa197264b30db097dde85b2dc4e758a7bf2d6bd2ec5c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027e301526d6c628f31e2d8c3a886baf14d5b8bbfc388e70185afeac73fdb323ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeae05027226c92efe1d1b98b904e86a045857a0579879951d5ef580dc1f7d931",
-        "network" : "EIP150",
+        "lastblockhash" : "0x272d6d5a438050291bd88834a470b1fe3eac24ccfcb9b0ffeae7945ef6941260",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f63668",
                 "code" : "",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "RevertRemoteSubCallStorageOOG_d0g2v0_EIP158" : {
+    "RevertRemoteSubCallStorageOOG_d0g2v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG_d0g2v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x023668",
-                    "hash" : "0xfb87f578447fde0e44ea126e833eaaa7f9d7d49b2286efe8ee3ecf86decd518a",
-                    "mixHash" : "0x6d82f7aab14848cc2dbe0ca527f618eb5a84a949c183839ea737bd137f4601a0",
-                    "nonce" : "0x1c9c8d960f824026",
+                    "hash" : "0xbb3face107170a6e48b445e0a6dac7e7ed7a148d9f1792be13be99a0f9a83a09",
+                    "mixHash" : "0x905019a2c4e290e84332ac9c166943947a86ba48fa3b4d76c1e8c07f2b79e063",
+                    "nonce" : "0xea9668f7cae407ea",
                     "number" : "0x01",
                     "parentHash" : "0x3a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18",
-                    "receiptTrie" : "0x2d69c988c48b51b167d6ff01eabcb6de459fcc62b52957c1c85608c39fadf21f",
-                    "stateRoot" : "0xd1a28b08e36926a83eda1e7f3d0fb1eee1365080c5718a1eb9e39ecbcbaa3d8a",
+                    "receiptTrie" : "0xd8f57081f4ea2813a4f6b446d5a5b7600495c52ae075cfaebc8ae4d3f116e2e8",
+                    "stateRoot" : "0x0e958ef00004b5d17aa9fd71040e149d7f4814f48275f225f107aa2fff0a0b14",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d1a28b08e36926a83eda1e7f3d0fb1eee1365080c5718a1eb9e39ecbcbaa3d8aa09cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57a02d69c988c48b51b167d6ff01eabcb6de459fcc62b52957c1c85608c39fadf21fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830236688203e880a06d82f7aab14848cc2dbe0ca527f618eb5a84a949c183839ea737bd137f4601a0881c9c8d960f824026f866f86480018302366894a0000000000000000000000000000000000000008084c04062261ca00732ad0b6c7efd9b1cd2d1dba4835fc97621a2a9a684a1d78842d19a2ebe7d5aa04c5a1223779d015f2c0c4fa197264b30db097dde85b2dc4e758a7bf2d6bd2ec5c0",
+                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e958ef00004b5d17aa9fd71040e149d7f4814f48275f225f107aa2fff0a0b14a09cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57a0d8f57081f4ea2813a4f6b446d5a5b7600495c52ae075cfaebc8ae4d3f116e2e8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830236688203e880a0905019a2c4e290e84332ac9c166943947a86ba48fa3b4d76c1e8c07f2b79e06388ea9668f7cae407eaf866f86480018302366894a0000000000000000000000000000000000000008084c04062261ca00732ad0b6c7efd9b1cd2d1dba4835fc97621a2a9a684a1d78842d19a2ebe7d5aa04c5a1223779d015f2c0c4fa197264b30db097dde85b2dc4e758a7bf2d6bd2ec5c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027e301526d6c628f31e2d8c3a886baf14d5b8bbfc388e70185afeac73fdb323ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfb87f578447fde0e44ea126e833eaaa7f9d7d49b2286efe8ee3ecf86decd518a",
-        "network" : "EIP158",
+        "lastblockhash" : "0xbb3face107170a6e48b445e0a6dac7e7ed7a148d9f1792be13be99a0f9a83a09",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f63668",
                 "code" : "",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "RevertRemoteSubCallStorageOOG_d0g2v0_Frontier" : {
+    "RevertRemoteSubCallStorageOOG_d0g2v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG_d0g2v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x023668",
-                    "hash" : "0x40ab470ae4e482705f3e967988d97555af7d0691ae213ca8b7278dfacf4286c1",
-                    "mixHash" : "0xf58fca6717343bea477c9182c79b42a1a821dd7665b96e32834717cd3706faed",
-                    "nonce" : "0x772168c8f19f0cee",
+                    "hash" : "0x68d7f09db4f52a6888362f11fac5801130a9c08c5e8e00d59036a49d112eff82",
+                    "mixHash" : "0x6894f26941d9c2c8a46bda3ee5dc6332ec96ebc9e46e43250f22c6f3d852d229",
+                    "nonce" : "0x484a84211756564e",
                     "number" : "0x01",
                     "parentHash" : "0x3a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18",
                     "receiptTrie" : "0x2d69c988c48b51b167d6ff01eabcb6de459fcc62b52957c1c85608c39fadf21f",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x9cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d1a28b08e36926a83eda1e7f3d0fb1eee1365080c5718a1eb9e39ecbcbaa3d8aa09cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57a02d69c988c48b51b167d6ff01eabcb6de459fcc62b52957c1c85608c39fadf21fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830236688203e880a0f58fca6717343bea477c9182c79b42a1a821dd7665b96e32834717cd3706faed88772168c8f19f0ceef866f86480018302366894a0000000000000000000000000000000000000008084c04062261ca00732ad0b6c7efd9b1cd2d1dba4835fc97621a2a9a684a1d78842d19a2ebe7d5aa04c5a1223779d015f2c0c4fa197264b30db097dde85b2dc4e758a7bf2d6bd2ec5c0",
+                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d1a28b08e36926a83eda1e7f3d0fb1eee1365080c5718a1eb9e39ecbcbaa3d8aa09cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57a02d69c988c48b51b167d6ff01eabcb6de459fcc62b52957c1c85608c39fadf21fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830236688203e880a06894f26941d9c2c8a46bda3ee5dc6332ec96ebc9e46e43250f22c6f3d852d22988484a84211756564ef866f86480018302366894a0000000000000000000000000000000000000008084c04062261ca00732ad0b6c7efd9b1cd2d1dba4835fc97621a2a9a684a1d78842d19a2ebe7d5aa04c5a1223779d015f2c0c4fa197264b30db097dde85b2dc4e758a7bf2d6bd2ec5c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027e301526d6c628f31e2d8c3a886baf14d5b8bbfc388e70185afeac73fdb323ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x40ab470ae4e482705f3e967988d97555af7d0691ae213ca8b7278dfacf4286c1",
-        "network" : "Frontier",
+        "lastblockhash" : "0x68d7f09db4f52a6888362f11fac5801130a9c08c5e8e00d59036a49d112eff82",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f63668",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "RevertRemoteSubCallStorageOOG_d0g2v0_Homestead" : {
+    "RevertRemoteSubCallStorageOOG_d0g2v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG_d0g2v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x023668",
-                    "hash" : "0xdac753b726555ae2ee29dfa44e4bc628b0fa5f03646ff23f76fd6e4958b21b39",
-                    "mixHash" : "0xb4871281541d9e7172578e535de2b055fd8260778df09182902a2bf57694e4e7",
-                    "nonce" : "0x53d0f3883d8e13c4",
+                    "hash" : "0xfddc7b07b9a913a5447735b11c0a7208561dfc76d5dc3a3bcb74d3a0c175ed90",
+                    "mixHash" : "0xc8cbecddbc206d5f16d1b42bff4295ab17f5afcc5ffc44a42c7830944f654574",
+                    "nonce" : "0xa2ca0365bb054706",
                     "number" : "0x01",
                     "parentHash" : "0x3a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18",
                     "receiptTrie" : "0x2d69c988c48b51b167d6ff01eabcb6de459fcc62b52957c1c85608c39fadf21f",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x9cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d1a28b08e36926a83eda1e7f3d0fb1eee1365080c5718a1eb9e39ecbcbaa3d8aa09cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57a02d69c988c48b51b167d6ff01eabcb6de459fcc62b52957c1c85608c39fadf21fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830236688203e880a0b4871281541d9e7172578e535de2b055fd8260778df09182902a2bf57694e4e78853d0f3883d8e13c4f866f86480018302366894a0000000000000000000000000000000000000008084c04062261ca00732ad0b6c7efd9b1cd2d1dba4835fc97621a2a9a684a1d78842d19a2ebe7d5aa04c5a1223779d015f2c0c4fa197264b30db097dde85b2dc4e758a7bf2d6bd2ec5c0",
+                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d1a28b08e36926a83eda1e7f3d0fb1eee1365080c5718a1eb9e39ecbcbaa3d8aa09cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57a02d69c988c48b51b167d6ff01eabcb6de459fcc62b52957c1c85608c39fadf21fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830236688203e880a0c8cbecddbc206d5f16d1b42bff4295ab17f5afcc5ffc44a42c7830944f65457488a2ca0365bb054706f866f86480018302366894a0000000000000000000000000000000000000008084c04062261ca00732ad0b6c7efd9b1cd2d1dba4835fc97621a2a9a684a1d78842d19a2ebe7d5aa04c5a1223779d015f2c0c4fa197264b30db097dde85b2dc4e758a7bf2d6bd2ec5c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027e301526d6c628f31e2d8c3a886baf14d5b8bbfc388e70185afeac73fdb323ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdac753b726555ae2ee29dfa44e4bc628b0fa5f03646ff23f76fd6e4958b21b39",
-        "network" : "Homestead",
+        "lastblockhash" : "0xfddc7b07b9a913a5447735b11c0a7208561dfc76d5dc3a3bcb74d3a0c175ed90",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f63668",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "RevertRemoteSubCallStorageOOG_d0g2v0_Metropolis" : {
+    "RevertRemoteSubCallStorageOOG_d0g2v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG_d0g2v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x023668",
-                    "hash" : "0x5c6b8798f47bd84a1658439b7311ca0f25bbf6c83fe906d6ff4f3415628f95a4",
-                    "mixHash" : "0x044d8b7900035913c659b384213a212b3af6798791d72089006024d2f8f08714",
-                    "nonce" : "0xf95f2b3c7929867d",
+                    "hash" : "0x72fa28c1ef83aeee8af25c4ccaa27d41d064767f7172f2389a55a8299f6b2e25",
+                    "mixHash" : "0x4051189fee83e4e948fe6ed55c9cc929b3049c617db156beb319965a00581afd",
+                    "nonce" : "0x545cd257e00c6ef7",
                     "number" : "0x01",
                     "parentHash" : "0x3a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18",
-                    "receiptTrie" : "0xd8f57081f4ea2813a4f6b446d5a5b7600495c52ae075cfaebc8ae4d3f116e2e8",
-                    "stateRoot" : "0x0e958ef00004b5d17aa9fd71040e149d7f4814f48275f225f107aa2fff0a0b14",
+                    "receiptTrie" : "0x2d69c988c48b51b167d6ff01eabcb6de459fcc62b52957c1c85608c39fadf21f",
+                    "stateRoot" : "0xd1a28b08e36926a83eda1e7f3d0fb1eee1365080c5718a1eb9e39ecbcbaa3d8a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x9cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e958ef00004b5d17aa9fd71040e149d7f4814f48275f225f107aa2fff0a0b14a09cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57a0d8f57081f4ea2813a4f6b446d5a5b7600495c52ae075cfaebc8ae4d3f116e2e8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830236688203e880a0044d8b7900035913c659b384213a212b3af6798791d72089006024d2f8f0871488f95f2b3c7929867df866f86480018302366894a0000000000000000000000000000000000000008084c04062261ca00732ad0b6c7efd9b1cd2d1dba4835fc97621a2a9a684a1d78842d19a2ebe7d5aa04c5a1223779d015f2c0c4fa197264b30db097dde85b2dc4e758a7bf2d6bd2ec5c0",
+                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d1a28b08e36926a83eda1e7f3d0fb1eee1365080c5718a1eb9e39ecbcbaa3d8aa09cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57a02d69c988c48b51b167d6ff01eabcb6de459fcc62b52957c1c85608c39fadf21fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830236688203e880a04051189fee83e4e948fe6ed55c9cc929b3049c617db156beb319965a00581afd88545cd257e00c6ef7f866f86480018302366894a0000000000000000000000000000000000000008084c04062261ca00732ad0b6c7efd9b1cd2d1dba4835fc97621a2a9a684a1d78842d19a2ebe7d5aa04c5a1223779d015f2c0c4fa197264b30db097dde85b2dc4e758a7bf2d6bd2ec5c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027e301526d6c628f31e2d8c3a886baf14d5b8bbfc388e70185afeac73fdb323ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5c6b8798f47bd84a1658439b7311ca0f25bbf6c83fe906d6ff4f3415628f95a4",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x72fa28c1ef83aeee8af25c4ccaa27d41d064767f7172f2389a55a8299f6b2e25",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f63668",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c414610049578063c040622614610058575b610000565b346100005761005661007f565b005b346100005761006561008a565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b6000600060405161016f80610163833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff166373027f6d306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b156100005760325a03f11561000057505050600d600181905550600191505b50905600606060405234610000575b610156806100196000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a72305820db9c9d1f37fd36768131a0bf9687f465e15b0503452e603be6b6f07b70d72e260029a165627a7a72305820f8ff2f7feef24d01a1cc070e67db9e15ac34810c8e5d1c7f34f3c38148eeae900029",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a2d998",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c414610049578063c040622614610058575b610000565b346100005761005661007f565b005b346100005761006561008a565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b6000600060405161016f80610163833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff166373027f6d306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b156100005760325a03f11561000057505050600d600181905550600191505b50905600606060405234610000575b610156806100196000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a72305820db9c9d1f37fd36768131a0bf9687f465e15b0503452e603be6b6f07b70d72e260029a165627a7a72305820f8ff2f7feef24d01a1cc070e67db9e15ac34810c8e5d1c7f34f3c38148eeae900029",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertRemoteSubCallStorageOOG_d0g2v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertRemoteSubCallStorageOOG_d0g2v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x023668",
+                    "hash" : "0x81ba46e72a7f1b8e25bae2d9a13d35cbeaae3160f3bc4012f1a1615c8ddb715a",
+                    "mixHash" : "0x4909f1cd88e6754f96085b1fe54d7567af7ef11bd0ca0070a6a815a92d740d09",
+                    "nonce" : "0x085e2cb392f98c3f",
+                    "number" : "0x01",
+                    "parentHash" : "0x3a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18",
+                    "receiptTrie" : "0x2d69c988c48b51b167d6ff01eabcb6de459fcc62b52957c1c85608c39fadf21f",
+                    "stateRoot" : "0xd1a28b08e36926a83eda1e7f3d0fb1eee1365080c5718a1eb9e39ecbcbaa3d8a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901f8a03a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d1a28b08e36926a83eda1e7f3d0fb1eee1365080c5718a1eb9e39ecbcbaa3d8aa09cd4d9ea3be7c2f26f757ebfda36062f4bc2f46b3f244bd30673f72963697d57a02d69c988c48b51b167d6ff01eabcb6de459fcc62b52957c1c85608c39fadf21fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830236688203e880a04909f1cd88e6754f96085b1fe54d7567af7ef11bd0ca0070a6a815a92d740d0988085e2cb392f98c3ff866f86480018302366894a0000000000000000000000000000000000000008084c04062261ca00732ad0b6c7efd9b1cd2d1dba4835fc97621a2a9a684a1d78842d19a2ebe7d5aa04c5a1223779d015f2c0c4fa197264b30db097dde85b2dc4e758a7bf2d6bd2ec5c0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x023668",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0732ad0b6c7efd9b1cd2d1dba4835fc97621a2a9a684a1d78842d19a2ebe7d5a",
+                        "s" : "0x4c5a1223779d015f2c0c4fa197264b30db097dde85b2dc4e758a7bf2d6bd2ec5",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3a02ae2cad7c6533fff53c0e4d87de484644cb870e3bdf683adb490cd04b7c18",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x27e301526d6c628f31e2d8c3a886baf14d5b8bbfc388e70185afeac73fdb323b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027e301526d6c628f31e2d8c3a886baf14d5b8bbfc388e70185afeac73fdb323ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x81ba46e72a7f1b8e25bae2d9a13d35cbeaae3160f3bc4012f1a1615c8ddb715a",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f63668",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g0v0.json
index b5dbac731..63d8dec3c 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertSubCallStorageOOG2_d0g0v0_EIP150" : {
+    "RevertSubCallStorageOOG2_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/stRevertTest/RevertSubCallStorageOOG2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103c4",
-                    "hash" : "0xd85e4a407c84fb571412a8c7b11475f4a990e9046252ce3883215c7e6c411db3",
-                    "mixHash" : "0x86bb844c99d5d0498350d5896ffa8630af7b2474ed223d380f3598243cb0f245",
-                    "nonce" : "0xeca264d5adb93a29",
+                    "hash" : "0x6da78278361cd979db68a1b4581e4030c89f0bb37341c790dcd572923abbef41",
+                    "mixHash" : "0x24aee79e9fcc48535175d3110cac13746084e025ed202c12eba3b401b2843d6d",
+                    "nonce" : "0x09c189eaeb4cc73a",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
-                    "receiptTrie" : "0xabf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470",
-                    "stateRoot" : "0x05156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288",
+                    "receiptTrie" : "0x375bfbef05f31b1b79b46728e0dffaa3f8a9f57635e80dea8eeb3e5548e23ee2",
+                    "stateRoot" : "0xd26b2c4cd2312d01ef6029548ed4af3a1aefd15102d400632d81d20187894f46",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x345e26059d068a55625b7e7de5e8c8c1d2a02c3ffd5e87cd7fa1e3f4f0200fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288a0345e26059d068a55625b7e7de5e8c8c1d2a02c3ffd5e87cd7fa1e3f4f0200fa5a0abf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a086bb844c99d5d0498350d5896ffa8630af7b2474ed223d380f3598243cb0f24588eca264d5adb93a29f866f8648001830103c494a0000000000000000000000000000000000000008084c04062261ba0b15f5ef4913737331a3bbf2a5e778083065c4fc39ba54f1f29fa13e1eed2db36a070386c148497cef012c57c39efcb22c7ed57aae1e577d594a7c348f2c804226dc0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d26b2c4cd2312d01ef6029548ed4af3a1aefd15102d400632d81d20187894f46a0345e26059d068a55625b7e7de5e8c8c1d2a02c3ffd5e87cd7fa1e3f4f0200fa5a0375bfbef05f31b1b79b46728e0dffaa3f8a9f57635e80dea8eeb3e5548e23ee2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a024aee79e9fcc48535175d3110cac13746084e025ed202c12eba3b401b2843d6d8809c189eaeb4cc73af866f8648001830103c494a0000000000000000000000000000000000000008084c04062261ba0b15f5ef4913737331a3bbf2a5e778083065c4fc39ba54f1f29fa13e1eed2db36a070386c148497cef012c57c39efcb22c7ed57aae1e577d594a7c348f2c804226dc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd85e4a407c84fb571412a8c7b11475f4a990e9046252ce3883215c7e6c411db3",
-        "network" : "EIP150",
+        "lastblockhash" : "0x6da78278361cd979db68a1b4581e4030c89f0bb37341c790dcd572923abbef41",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503c4",
                 "code" : "",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG2_d0g0v0_EIP158" : {
+    "RevertSubCallStorageOOG2_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/stRevertTest/RevertSubCallStorageOOG2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103c4",
-                    "hash" : "0x87017026f44c7cf72e9f738f56733968531d762d0076dd64793ab650a77a50f7",
-                    "mixHash" : "0x06d59acf99766599a40448f4219e1c75e5204765fccec5ab94e7d5c41932a3e1",
-                    "nonce" : "0x498239f11118ce68",
+                    "hash" : "0x1088b7c718726fb64ee64235e14911e4200ed7bf3ba0a202461d57d4fa3d268b",
+                    "mixHash" : "0x8027ad83d1ad419793a4a93d525ab2e00962a15edc00c900dc615bd5ac4ffe4d",
+                    "nonce" : "0x883de4b66e22c5a1",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
-                    "receiptTrie" : "0xabf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470",
-                    "stateRoot" : "0x05156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288",
+                    "receiptTrie" : "0x375bfbef05f31b1b79b46728e0dffaa3f8a9f57635e80dea8eeb3e5548e23ee2",
+                    "stateRoot" : "0xd26b2c4cd2312d01ef6029548ed4af3a1aefd15102d400632d81d20187894f46",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x345e26059d068a55625b7e7de5e8c8c1d2a02c3ffd5e87cd7fa1e3f4f0200fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288a0345e26059d068a55625b7e7de5e8c8c1d2a02c3ffd5e87cd7fa1e3f4f0200fa5a0abf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a006d59acf99766599a40448f4219e1c75e5204765fccec5ab94e7d5c41932a3e188498239f11118ce68f866f8648001830103c494a0000000000000000000000000000000000000008084c04062261ba0b15f5ef4913737331a3bbf2a5e778083065c4fc39ba54f1f29fa13e1eed2db36a070386c148497cef012c57c39efcb22c7ed57aae1e577d594a7c348f2c804226dc0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d26b2c4cd2312d01ef6029548ed4af3a1aefd15102d400632d81d20187894f46a0345e26059d068a55625b7e7de5e8c8c1d2a02c3ffd5e87cd7fa1e3f4f0200fa5a0375bfbef05f31b1b79b46728e0dffaa3f8a9f57635e80dea8eeb3e5548e23ee2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a08027ad83d1ad419793a4a93d525ab2e00962a15edc00c900dc615bd5ac4ffe4d88883de4b66e22c5a1f866f8648001830103c494a0000000000000000000000000000000000000008084c04062261ba0b15f5ef4913737331a3bbf2a5e778083065c4fc39ba54f1f29fa13e1eed2db36a070386c148497cef012c57c39efcb22c7ed57aae1e577d594a7c348f2c804226dc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x87017026f44c7cf72e9f738f56733968531d762d0076dd64793ab650a77a50f7",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1088b7c718726fb64ee64235e14911e4200ed7bf3ba0a202461d57d4fa3d268b",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503c4",
                 "code" : "",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG2_d0g0v0_Frontier" : {
+    "RevertSubCallStorageOOG2_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/stRevertTest/RevertSubCallStorageOOG2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103c4",
-                    "hash" : "0x91e0b49000f567ee5a25b90c3cfc7359615ae48f9d2d5db06751ea16c933d56e",
-                    "mixHash" : "0xa7d2a8429dc0b5ea6f5e2b6ed28f4f7650be6269473c42cce59fea1e504947e6",
-                    "nonce" : "0x4b02613c390e2d54",
+                    "hash" : "0x7d000eb497bfe169ab981e1ebc386de9840b3d9f71d8b0b896761e3aa672e61b",
+                    "mixHash" : "0x5566022a5a85e3e1ed99e2a50179911ebc02b63e9520020bd2513b05983ac5bc",
+                    "nonce" : "0x9d55c4816a1516a2",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
                     "receiptTrie" : "0xabf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x345e26059d068a55625b7e7de5e8c8c1d2a02c3ffd5e87cd7fa1e3f4f0200fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288a0345e26059d068a55625b7e7de5e8c8c1d2a02c3ffd5e87cd7fa1e3f4f0200fa5a0abf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a0a7d2a8429dc0b5ea6f5e2b6ed28f4f7650be6269473c42cce59fea1e504947e6884b02613c390e2d54f866f8648001830103c494a0000000000000000000000000000000000000008084c04062261ba0b15f5ef4913737331a3bbf2a5e778083065c4fc39ba54f1f29fa13e1eed2db36a070386c148497cef012c57c39efcb22c7ed57aae1e577d594a7c348f2c804226dc0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288a0345e26059d068a55625b7e7de5e8c8c1d2a02c3ffd5e87cd7fa1e3f4f0200fa5a0abf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a05566022a5a85e3e1ed99e2a50179911ebc02b63e9520020bd2513b05983ac5bc889d55c4816a1516a2f866f8648001830103c494a0000000000000000000000000000000000000008084c04062261ba0b15f5ef4913737331a3bbf2a5e778083065c4fc39ba54f1f29fa13e1eed2db36a070386c148497cef012c57c39efcb22c7ed57aae1e577d594a7c348f2c804226dc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x91e0b49000f567ee5a25b90c3cfc7359615ae48f9d2d5db06751ea16c933d56e",
-        "network" : "Frontier",
+        "lastblockhash" : "0x7d000eb497bfe169ab981e1ebc386de9840b3d9f71d8b0b896761e3aa672e61b",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503c4",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG2_d0g0v0_Homestead" : {
+    "RevertSubCallStorageOOG2_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/stRevertTest/RevertSubCallStorageOOG2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103c4",
-                    "hash" : "0x5a701650bd87c90bbe589ee6f2864dfe2d4b8bece6c0e6d2157979003c9b058f",
-                    "mixHash" : "0xb1374f3eb9837ad67d5ae1a15d074b84d5d7cae3a2522e888c6a5c33968a2402",
-                    "nonce" : "0xd06388aa226c4a7c",
+                    "hash" : "0x769e59f86f25f8e021bb025db9c2289d23ee4b51302d2da13848cb86653da446",
+                    "mixHash" : "0x931f56f44ada1b2e4ece0f9bb8d411c4591338fab0ffd70fb4cfea8b109dca7b",
+                    "nonce" : "0x6e6700e5106a37dc",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
                     "receiptTrie" : "0xabf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x345e26059d068a55625b7e7de5e8c8c1d2a02c3ffd5e87cd7fa1e3f4f0200fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288a0345e26059d068a55625b7e7de5e8c8c1d2a02c3ffd5e87cd7fa1e3f4f0200fa5a0abf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a0b1374f3eb9837ad67d5ae1a15d074b84d5d7cae3a2522e888c6a5c33968a240288d06388aa226c4a7cf866f8648001830103c494a0000000000000000000000000000000000000008084c04062261ba0b15f5ef4913737331a3bbf2a5e778083065c4fc39ba54f1f29fa13e1eed2db36a070386c148497cef012c57c39efcb22c7ed57aae1e577d594a7c348f2c804226dc0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288a0345e26059d068a55625b7e7de5e8c8c1d2a02c3ffd5e87cd7fa1e3f4f0200fa5a0abf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a0931f56f44ada1b2e4ece0f9bb8d411c4591338fab0ffd70fb4cfea8b109dca7b886e6700e5106a37dcf866f8648001830103c494a0000000000000000000000000000000000000008084c04062261ba0b15f5ef4913737331a3bbf2a5e778083065c4fc39ba54f1f29fa13e1eed2db36a070386c148497cef012c57c39efcb22c7ed57aae1e577d594a7c348f2c804226dc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5a701650bd87c90bbe589ee6f2864dfe2d4b8bece6c0e6d2157979003c9b058f",
-        "network" : "Homestead",
+        "lastblockhash" : "0x769e59f86f25f8e021bb025db9c2289d23ee4b51302d2da13848cb86653da446",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503c4",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG2_d0g0v0_Metropolis" : {
+    "RevertSubCallStorageOOG2_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/stRevertTest/RevertSubCallStorageOOG2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103c4",
-                    "hash" : "0xb6c2401749db697a544dc3f84efa946b8ec2ae45223148e4e795478797cec604",
-                    "mixHash" : "0x5310068ee530cbf8ca03bb0c9e8c8a6b0c20af397082099f6bfcada9ce477612",
-                    "nonce" : "0xb5f59a603361a63d",
+                    "hash" : "0x93869df08aa2dbd23f286587ee8c8933fb370cb53cf9337fe5ba30e078908595",
+                    "mixHash" : "0xa9c8124eb03c97bfe9ae51e4c0a2468acf614a95e9749e1e252b08bd0ac0ac13",
+                    "nonce" : "0x8097d06036ab9ffb",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
-                    "receiptTrie" : "0x375bfbef05f31b1b79b46728e0dffaa3f8a9f57635e80dea8eeb3e5548e23ee2",
-                    "stateRoot" : "0xd26b2c4cd2312d01ef6029548ed4af3a1aefd15102d400632d81d20187894f46",
+                    "receiptTrie" : "0xabf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470",
+                    "stateRoot" : "0x05156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x345e26059d068a55625b7e7de5e8c8c1d2a02c3ffd5e87cd7fa1e3f4f0200fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d26b2c4cd2312d01ef6029548ed4af3a1aefd15102d400632d81d20187894f46a0345e26059d068a55625b7e7de5e8c8c1d2a02c3ffd5e87cd7fa1e3f4f0200fa5a0375bfbef05f31b1b79b46728e0dffaa3f8a9f57635e80dea8eeb3e5548e23ee2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a05310068ee530cbf8ca03bb0c9e8c8a6b0c20af397082099f6bfcada9ce47761288b5f59a603361a63df866f8648001830103c494a0000000000000000000000000000000000000008084c04062261ba0b15f5ef4913737331a3bbf2a5e778083065c4fc39ba54f1f29fa13e1eed2db36a070386c148497cef012c57c39efcb22c7ed57aae1e577d594a7c348f2c804226dc0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288a0345e26059d068a55625b7e7de5e8c8c1d2a02c3ffd5e87cd7fa1e3f4f0200fa5a0abf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a0a9c8124eb03c97bfe9ae51e4c0a2468acf614a95e9749e1e252b08bd0ac0ac13888097d06036ab9ffbf866f8648001830103c494a0000000000000000000000000000000000000008084c04062261ba0b15f5ef4913737331a3bbf2a5e778083065c4fc39ba54f1f29fa13e1eed2db36a070386c148497cef012c57c39efcb22c7ed57aae1e577d594a7c348f2c804226dc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb6c2401749db697a544dc3f84efa946b8ec2ae45223148e4e795478797cec604",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x93869df08aa2dbd23f286587ee8c8933fb370cb53cf9337fe5ba30e078908595",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f503c4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600081905550600e6001819055505b905600a165627a7a72305820b7c6987c21e63fed8a74d899557744a3be8d3fda191ce0f56cf261d6b860f6b40029",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a40c3c",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600081905550600e6001819055505b905600a165627a7a72305820b7c6987c21e63fed8a74d899557744a3be8d3fda191ce0f56cf261d6b860f6b40029",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertSubCallStorageOOG2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0103c4",
+                    "hash" : "0x464f251e22583a302b26a53926ec1c758aa7af8322e6344f7c8333fe6e41f0b5",
+                    "mixHash" : "0x6e01d8bd00b8d696ab21423c4c74b250921a546dc7f236290518912069078347",
+                    "nonce" : "0xe9c2c5bedd877bc1",
+                    "number" : "0x01",
+                    "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
+                    "receiptTrie" : "0xabf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470",
+                    "stateRoot" : "0x05156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x345e26059d068a55625b7e7de5e8c8c1d2a02c3ffd5e87cd7fa1e3f4f0200fa5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288a0345e26059d068a55625b7e7de5e8c8c1d2a02c3ffd5e87cd7fa1e3f4f0200fa5a0abf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a06e01d8bd00b8d696ab21423c4c74b250921a546dc7f23629051891206907834788e9c2c5bedd877bc1f866f8648001830103c494a0000000000000000000000000000000000000008084c04062261ba0b15f5ef4913737331a3bbf2a5e778083065c4fc39ba54f1f29fa13e1eed2db36a070386c148497cef012c57c39efcb22c7ed57aae1e577d594a7c348f2c804226dc0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x0103c4",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb15f5ef4913737331a3bbf2a5e778083065c4fc39ba54f1f29fa13e1eed2db36",
+                        "s" : "0x70386c148497cef012c57c39efcb22c7ed57aae1e577d594a7c348f2c804226d",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x464f251e22583a302b26a53926ec1c758aa7af8322e6344f7c8333fe6e41f0b5",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503c4",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g0v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g0v1.json
index a719e166e..5886e04a9 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g0v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g0v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertSubCallStorageOOG2_d0g0v1_EIP150" : {
+    "RevertSubCallStorageOOG2_d0g0v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103c4",
-                    "hash" : "0xf49a938e6b2dc329494ab3ee6a07671ff388a58723089d1ca8557de4f980517a",
-                    "mixHash" : "0xe28166b163b69bfad300f0271b02484e16a822c681a79302f91edfacdef07295",
-                    "nonce" : "0xeaa39bc239114d8e",
+                    "hash" : "0x4e43679090d11b91473b5421d752e497806a72bea068c9db361d4a58a74cf0d8",
+                    "mixHash" : "0xe83db0a798bc1297f18cf9cf339a1efd1bbdaa5301dc5ad5a262adc8f873dbc4",
+                    "nonce" : "0x1d8da41d5a95174c",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
-                    "receiptTrie" : "0xabf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470",
-                    "stateRoot" : "0x05156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288",
+                    "receiptTrie" : "0x375bfbef05f31b1b79b46728e0dffaa3f8a9f57635e80dea8eeb3e5548e23ee2",
+                    "stateRoot" : "0xd26b2c4cd2312d01ef6029548ed4af3a1aefd15102d400632d81d20187894f46",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288a03826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061a0abf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a0e28166b163b69bfad300f0271b02484e16a822c681a79302f91edfacdef0729588eaa39bc239114d8ef866f8648001830103c494a0000000000000000000000000000000000000000184c04062261ba0137ee53667401cbfb8fc5d2c9bd1be3a80c878b74c06ff6700a5416b43b3ff33a01d0b535b30ee294865bc8df3c289243202c3312dd03eff17bb91526db7d9a393c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d26b2c4cd2312d01ef6029548ed4af3a1aefd15102d400632d81d20187894f46a03826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061a0375bfbef05f31b1b79b46728e0dffaa3f8a9f57635e80dea8eeb3e5548e23ee2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a0e83db0a798bc1297f18cf9cf339a1efd1bbdaa5301dc5ad5a262adc8f873dbc4881d8da41d5a95174cf866f8648001830103c494a0000000000000000000000000000000000000000184c04062261ba0137ee53667401cbfb8fc5d2c9bd1be3a80c878b74c06ff6700a5416b43b3ff33a01d0b535b30ee294865bc8df3c289243202c3312dd03eff17bb91526db7d9a393c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf49a938e6b2dc329494ab3ee6a07671ff388a58723089d1ca8557de4f980517a",
-        "network" : "EIP150",
+        "lastblockhash" : "0x4e43679090d11b91473b5421d752e497806a72bea068c9db361d4a58a74cf0d8",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503c4",
                 "code" : "",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG2_d0g0v1_EIP158" : {
+    "RevertSubCallStorageOOG2_d0g0v1_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103c4",
-                    "hash" : "0xfab4a326435b235640b910b29b59d1263effb85be8a0052abc94ff274177d53d",
-                    "mixHash" : "0x7db087b665b66b97ce194dac3eaafde49622273bef91c14bce16c2e5fea6b548",
-                    "nonce" : "0xec32e1a241d78986",
+                    "hash" : "0x3160ebaa638282c34417a7b94f03c1777f9b5bcc4a599cdda288ae551afd972d",
+                    "mixHash" : "0x900810292bc2aed207da3c03a187bc5269f59178016de811e317acb72eb6cd4a",
+                    "nonce" : "0x734c52f4c5f0049b",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
-                    "receiptTrie" : "0xabf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470",
-                    "stateRoot" : "0x05156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288",
+                    "receiptTrie" : "0x375bfbef05f31b1b79b46728e0dffaa3f8a9f57635e80dea8eeb3e5548e23ee2",
+                    "stateRoot" : "0xd26b2c4cd2312d01ef6029548ed4af3a1aefd15102d400632d81d20187894f46",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288a03826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061a0abf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a07db087b665b66b97ce194dac3eaafde49622273bef91c14bce16c2e5fea6b54888ec32e1a241d78986f866f8648001830103c494a0000000000000000000000000000000000000000184c04062261ba0137ee53667401cbfb8fc5d2c9bd1be3a80c878b74c06ff6700a5416b43b3ff33a01d0b535b30ee294865bc8df3c289243202c3312dd03eff17bb91526db7d9a393c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d26b2c4cd2312d01ef6029548ed4af3a1aefd15102d400632d81d20187894f46a03826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061a0375bfbef05f31b1b79b46728e0dffaa3f8a9f57635e80dea8eeb3e5548e23ee2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a0900810292bc2aed207da3c03a187bc5269f59178016de811e317acb72eb6cd4a88734c52f4c5f0049bf866f8648001830103c494a0000000000000000000000000000000000000000184c04062261ba0137ee53667401cbfb8fc5d2c9bd1be3a80c878b74c06ff6700a5416b43b3ff33a01d0b535b30ee294865bc8df3c289243202c3312dd03eff17bb91526db7d9a393c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfab4a326435b235640b910b29b59d1263effb85be8a0052abc94ff274177d53d",
-        "network" : "EIP158",
+        "lastblockhash" : "0x3160ebaa638282c34417a7b94f03c1777f9b5bcc4a599cdda288ae551afd972d",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503c4",
                 "code" : "",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG2_d0g0v1_Frontier" : {
+    "RevertSubCallStorageOOG2_d0g0v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103c4",
-                    "hash" : "0xa54d01d3b2019ddc3bea9ed4a3dbfd2108baff8319fb30941358bd8a4812c32c",
-                    "mixHash" : "0xeda7141d339f59e32c656e1e0fad7359f352210b36b07beab2521db5dda8f195",
-                    "nonce" : "0x281984d9dd058ed9",
+                    "hash" : "0xc451a7eea99ab12f32164ce10bafa0fd82d132dfe1a77a50f143a81f3ed057af",
+                    "mixHash" : "0x081c35b58d4d2ff7e5252bfbe479e5c1860fcf343b9c373eb51b1afcbecc8abb",
+                    "nonce" : "0x522f9fedf3e35c9a",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
                     "receiptTrie" : "0xabf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x3826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288a03826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061a0abf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a0eda7141d339f59e32c656e1e0fad7359f352210b36b07beab2521db5dda8f19588281984d9dd058ed9f866f8648001830103c494a0000000000000000000000000000000000000000184c04062261ba0137ee53667401cbfb8fc5d2c9bd1be3a80c878b74c06ff6700a5416b43b3ff33a01d0b535b30ee294865bc8df3c289243202c3312dd03eff17bb91526db7d9a393c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288a03826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061a0abf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a0081c35b58d4d2ff7e5252bfbe479e5c1860fcf343b9c373eb51b1afcbecc8abb88522f9fedf3e35c9af866f8648001830103c494a0000000000000000000000000000000000000000184c04062261ba0137ee53667401cbfb8fc5d2c9bd1be3a80c878b74c06ff6700a5416b43b3ff33a01d0b535b30ee294865bc8df3c289243202c3312dd03eff17bb91526db7d9a393c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa54d01d3b2019ddc3bea9ed4a3dbfd2108baff8319fb30941358bd8a4812c32c",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc451a7eea99ab12f32164ce10bafa0fd82d132dfe1a77a50f143a81f3ed057af",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503c4",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG2_d0g0v1_Homestead" : {
+    "RevertSubCallStorageOOG2_d0g0v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103c4",
-                    "hash" : "0xe0ba61b322c8d8afb526ad0b70a86ba5f5e343a1ff1ffba7a6c862b67a89410f",
-                    "mixHash" : "0x6ae5340327eb873320dc6c9e83fbe36060a340334da7eea6d23006d7f7d5accf",
-                    "nonce" : "0x906fa6e6cc4bbb40",
+                    "hash" : "0x9fe21ae5e2adcc19e1be2711ac820382e065d131b951567fff07afa2cf598dfa",
+                    "mixHash" : "0x8cf54dd4ee71948e49b9137ed61da546a711b45832a8fac97e940fe0531a506a",
+                    "nonce" : "0xf07ed4c0136cbd73",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
                     "receiptTrie" : "0xabf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x3826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288a03826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061a0abf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a06ae5340327eb873320dc6c9e83fbe36060a340334da7eea6d23006d7f7d5accf88906fa6e6cc4bbb40f866f8648001830103c494a0000000000000000000000000000000000000000184c04062261ba0137ee53667401cbfb8fc5d2c9bd1be3a80c878b74c06ff6700a5416b43b3ff33a01d0b535b30ee294865bc8df3c289243202c3312dd03eff17bb91526db7d9a393c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288a03826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061a0abf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a08cf54dd4ee71948e49b9137ed61da546a711b45832a8fac97e940fe0531a506a88f07ed4c0136cbd73f866f8648001830103c494a0000000000000000000000000000000000000000184c04062261ba0137ee53667401cbfb8fc5d2c9bd1be3a80c878b74c06ff6700a5416b43b3ff33a01d0b535b30ee294865bc8df3c289243202c3312dd03eff17bb91526db7d9a393c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe0ba61b322c8d8afb526ad0b70a86ba5f5e343a1ff1ffba7a6c862b67a89410f",
-        "network" : "Homestead",
+        "lastblockhash" : "0x9fe21ae5e2adcc19e1be2711ac820382e065d131b951567fff07afa2cf598dfa",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503c4",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG2_d0g0v1_Metropolis" : {
+    "RevertSubCallStorageOOG2_d0g0v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103c4",
-                    "hash" : "0xb1c4b5b7504c8d75bbcc625f50241e0cee90b08cc2e6cd516bc3eafe90855f5c",
-                    "mixHash" : "0xaf62252134c1541e40580ecd55120c4c8c1a7ab9b5ea711ccce3c3e8a577b83a",
-                    "nonce" : "0xdebb9065c60a59d8",
+                    "hash" : "0xd78cf4c5340ef2539df8cf3f54c277691a82bd352869fceaa7be909c7fbb6f36",
+                    "mixHash" : "0x442faf4e2fe3230b735f185e49cc86b13f6acc332898db55c616391ef9b0e3b0",
+                    "nonce" : "0x1d271c2f71d31fae",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
-                    "receiptTrie" : "0x375bfbef05f31b1b79b46728e0dffaa3f8a9f57635e80dea8eeb3e5548e23ee2",
-                    "stateRoot" : "0xd26b2c4cd2312d01ef6029548ed4af3a1aefd15102d400632d81d20187894f46",
+                    "receiptTrie" : "0xabf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470",
+                    "stateRoot" : "0x05156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d26b2c4cd2312d01ef6029548ed4af3a1aefd15102d400632d81d20187894f46a03826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061a0375bfbef05f31b1b79b46728e0dffaa3f8a9f57635e80dea8eeb3e5548e23ee2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a0af62252134c1541e40580ecd55120c4c8c1a7ab9b5ea711ccce3c3e8a577b83a88debb9065c60a59d8f866f8648001830103c494a0000000000000000000000000000000000000000184c04062261ba0137ee53667401cbfb8fc5d2c9bd1be3a80c878b74c06ff6700a5416b43b3ff33a01d0b535b30ee294865bc8df3c289243202c3312dd03eff17bb91526db7d9a393c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288a03826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061a0abf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a0442faf4e2fe3230b735f185e49cc86b13f6acc332898db55c616391ef9b0e3b0881d271c2f71d31faef866f8648001830103c494a0000000000000000000000000000000000000000184c04062261ba0137ee53667401cbfb8fc5d2c9bd1be3a80c878b74c06ff6700a5416b43b3ff33a01d0b535b30ee294865bc8df3c289243202c3312dd03eff17bb91526db7d9a393c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb1c4b5b7504c8d75bbcc625f50241e0cee90b08cc2e6cd516bc3eafe90855f5c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd78cf4c5340ef2539df8cf3f54c277691a82bd352869fceaa7be909c7fbb6f36",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f503c4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600081905550600e6001819055505b905600a165627a7a72305820b7c6987c21e63fed8a74d899557744a3be8d3fda191ce0f56cf261d6b860f6b40029",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a40c3c",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600081905550600e6001819055505b905600a165627a7a72305820b7c6987c21e63fed8a74d899557744a3be8d3fda191ce0f56cf261d6b860f6b40029",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertSubCallStorageOOG2_d0g0v1_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g0v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0103c4",
+                    "hash" : "0xfa8ea747379bfb2132af1cdc7f34783b3de7540f9e7b5f94438b04f81af25b61",
+                    "mixHash" : "0xbe25616d41261407fa52e50e46ee45b23091cd43a56421a50b5f0942bcd44f65",
+                    "nonce" : "0x88dbbe7a8e691d41",
+                    "number" : "0x01",
+                    "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
+                    "receiptTrie" : "0xabf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470",
+                    "stateRoot" : "0x05156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288a03826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061a0abf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a0be25616d41261407fa52e50e46ee45b23091cd43a56421a50b5f0942bcd44f658888dbbe7a8e691d41f866f8648001830103c494a0000000000000000000000000000000000000000184c04062261ba0137ee53667401cbfb8fc5d2c9bd1be3a80c878b74c06ff6700a5416b43b3ff33a01d0b535b30ee294865bc8df3c289243202c3312dd03eff17bb91526db7d9a393c0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x0103c4",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x137ee53667401cbfb8fc5d2c9bd1be3a80c878b74c06ff6700a5416b43b3ff33",
+                        "s" : "0x1d0b535b30ee294865bc8df3c289243202c3312dd03eff17bb91526db7d9a393",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfa8ea747379bfb2132af1cdc7f34783b3de7540f9e7b5f94438b04f81af25b61",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503c4",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g1v0.json
index 92f4b4d2d..b83109710 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertSubCallStorageOOG2_d0g1v0_EIP150" : {
+    "RevertSubCallStorageOOG2_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103e7",
-                    "hash" : "0xf6e5ddb8d944151a67390b0b3242913d6c2507961de71950d79cf9c79cf2c5bf",
-                    "mixHash" : "0xee57de7f6ba5d9340eb84ae4389d8c4252768cb3096f5f035a159404649533d2",
-                    "nonce" : "0x112de40fdb50d4b9",
+                    "hash" : "0x7698b7b719b5ad9548186432da447844fc63e1d956059e163c18965b0c41f311",
+                    "mixHash" : "0x62c93a687dc30556a606fa7df00c0deb73eaaa1aa4b02b6bea565f1c10dc89d7",
+                    "nonce" : "0x989025a716f12364",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
-                    "receiptTrie" : "0xaa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79",
-                    "stateRoot" : "0x4508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46",
+                    "receiptTrie" : "0x3c515ae6b34b22b263091c6243671a687efd39fdac0444e0a97ecf557d93a4c2",
+                    "stateRoot" : "0x4f3ae4f3d4c1808036b10dcba28672426909a4b7aeac09ab2bd6b7a4e54712ce",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0aa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a0ee57de7f6ba5d9340eb84ae4389d8c4252768cb3096f5f035a159404649533d288112de40fdb50d4b9f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f3ae4f3d4c1808036b10dcba28672426909a4b7aeac09ab2bd6b7a4e54712cea00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a03c515ae6b34b22b263091c6243671a687efd39fdac0444e0a97ecf557d93a4c2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a062c93a687dc30556a606fa7df00c0deb73eaaa1aa4b02b6bea565f1c10dc89d788989025a716f12364f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf6e5ddb8d944151a67390b0b3242913d6c2507961de71950d79cf9c79cf2c5bf",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7698b7b719b5ad9548186432da447844fc63e1d956059e163c18965b0c41f311",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503e7",
                 "code" : "",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG2_d0g1v0_EIP158" : {
+    "RevertSubCallStorageOOG2_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103e7",
-                    "hash" : "0xb43f4e854e7ef4a3e3d9ee957f42ac2807318f0cec3cc0abbb4919ae7b82a5b3",
-                    "mixHash" : "0x0c5f3fcce481d944ee61862325a090f2c4c3377a53440d4803548f9a95d700df",
-                    "nonce" : "0xa37c7e9d6c473184",
+                    "hash" : "0x1aea095850d8d391b3c62035342572850db769e6096d2d63aa90741651f718c0",
+                    "mixHash" : "0xd8986acda5477ecd220fddf482c16aebb9979741685d9d1dc7971316fd02677f",
+                    "nonce" : "0x35701da7e341983f",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
-                    "receiptTrie" : "0xaa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79",
-                    "stateRoot" : "0x4508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46",
+                    "receiptTrie" : "0x3c515ae6b34b22b263091c6243671a687efd39fdac0444e0a97ecf557d93a4c2",
+                    "stateRoot" : "0x4f3ae4f3d4c1808036b10dcba28672426909a4b7aeac09ab2bd6b7a4e54712ce",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0aa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a00c5f3fcce481d944ee61862325a090f2c4c3377a53440d4803548f9a95d700df88a37c7e9d6c473184f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f3ae4f3d4c1808036b10dcba28672426909a4b7aeac09ab2bd6b7a4e54712cea00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a03c515ae6b34b22b263091c6243671a687efd39fdac0444e0a97ecf557d93a4c2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a0d8986acda5477ecd220fddf482c16aebb9979741685d9d1dc7971316fd02677f8835701da7e341983ff866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb43f4e854e7ef4a3e3d9ee957f42ac2807318f0cec3cc0abbb4919ae7b82a5b3",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1aea095850d8d391b3c62035342572850db769e6096d2d63aa90741651f718c0",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503e7",
                 "code" : "",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG2_d0g1v0_Frontier" : {
+    "RevertSubCallStorageOOG2_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103e7",
-                    "hash" : "0xe26fec98300b3f5abf9a5c3a0c97297dab06ecbbbd3051945a0245955707ad4b",
-                    "mixHash" : "0xa331654be7772e472d8d58c536169cae9ef618a868ddafa7cdd76c97f1181af2",
-                    "nonce" : "0x5fb623475c10c96b",
+                    "hash" : "0xb14578113646cb29484da50cc59db57bcc9774a7ad1dbf0c6290750bd8bcc755",
+                    "mixHash" : "0x6766ee9397e7f6c21e0ed931a9d16b363f3f7e4813962cd704d49da5e4d0b306",
+                    "nonce" : "0x8eec2fb5365500f3",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
                     "receiptTrie" : "0xaa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0aa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a0a331654be7772e472d8d58c536169cae9ef618a868ddafa7cdd76c97f1181af2885fb623475c10c96bf866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0aa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a06766ee9397e7f6c21e0ed931a9d16b363f3f7e4813962cd704d49da5e4d0b306888eec2fb5365500f3f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe26fec98300b3f5abf9a5c3a0c97297dab06ecbbbd3051945a0245955707ad4b",
-        "network" : "Frontier",
+        "lastblockhash" : "0xb14578113646cb29484da50cc59db57bcc9774a7ad1dbf0c6290750bd8bcc755",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503e7",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG2_d0g1v0_Homestead" : {
+    "RevertSubCallStorageOOG2_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103e7",
-                    "hash" : "0xed2a8d6e042cdf84a15922794f60bbb8aa28dcb10ac9b52e8460840a191ff878",
-                    "mixHash" : "0x38d4ffb74ec14e38fb669a1df59886d33578f77836efac72b1fb368a45747af5",
-                    "nonce" : "0x762fedba3375af37",
+                    "hash" : "0xefb38c018d7324e40d07667eb6812018d85d25566c66e2c12bd340608d2c162d",
+                    "mixHash" : "0xcbb6c4f70ab97f49a0322bec81e830ce67e421fb94f8b48d245248451de02765",
+                    "nonce" : "0xa2ae0ad77275bc9a",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
                     "receiptTrie" : "0xaa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0aa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a038d4ffb74ec14e38fb669a1df59886d33578f77836efac72b1fb368a45747af588762fedba3375af37f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0aa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a0cbb6c4f70ab97f49a0322bec81e830ce67e421fb94f8b48d245248451de0276588a2ae0ad77275bc9af866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xed2a8d6e042cdf84a15922794f60bbb8aa28dcb10ac9b52e8460840a191ff878",
-        "network" : "Homestead",
+        "lastblockhash" : "0xefb38c018d7324e40d07667eb6812018d85d25566c66e2c12bd340608d2c162d",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503e7",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG2_d0g1v0_Metropolis" : {
+    "RevertSubCallStorageOOG2_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103e7",
-                    "hash" : "0x3c7d2a869feebf9685fb11b04da6c6e21ccacab6728f1a01309b12ba5f57b5d3",
-                    "mixHash" : "0x8935e5eee177203cee43ff9844767b84f1befe5cf249e07925d389261a05c8af",
-                    "nonce" : "0xca033dc3a79eaa5b",
+                    "hash" : "0x18c7c10782d296e04f9f37a2b1d3c10b5257ac0c48f7cab4682f9fb0f7ec74f4",
+                    "mixHash" : "0x3a8dba684695d691d67a6c147c9cf6db79afb833f0bcc59a71c77c0a575a9c4a",
+                    "nonce" : "0x20a407bf6ad02225",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
-                    "receiptTrie" : "0x3c515ae6b34b22b263091c6243671a687efd39fdac0444e0a97ecf557d93a4c2",
-                    "stateRoot" : "0x4f3ae4f3d4c1808036b10dcba28672426909a4b7aeac09ab2bd6b7a4e54712ce",
+                    "receiptTrie" : "0xaa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79",
+                    "stateRoot" : "0x4508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f3ae4f3d4c1808036b10dcba28672426909a4b7aeac09ab2bd6b7a4e54712cea00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a03c515ae6b34b22b263091c6243671a687efd39fdac0444e0a97ecf557d93a4c2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a08935e5eee177203cee43ff9844767b84f1befe5cf249e07925d389261a05c8af88ca033dc3a79eaa5bf866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0aa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a03a8dba684695d691d67a6c147c9cf6db79afb833f0bcc59a71c77c0a575a9c4a8820a407bf6ad02225f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3c7d2a869feebf9685fb11b04da6c6e21ccacab6728f1a01309b12ba5f57b5d3",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x18c7c10782d296e04f9f37a2b1d3c10b5257ac0c48f7cab4682f9fb0f7ec74f4",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f503e7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600081905550600e6001819055505b905600a165627a7a72305820b7c6987c21e63fed8a74d899557744a3be8d3fda191ce0f56cf261d6b860f6b40029",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x0d",
+                    "0x01" : "0x0e"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a40c19",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600081905550600e6001819055505b905600a165627a7a72305820b7c6987c21e63fed8a74d899557744a3be8d3fda191ce0f56cf261d6b860f6b40029",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertSubCallStorageOOG2_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0103e7",
+                    "hash" : "0x4a8c0041b47e1b2904389436c371670fef40c9edc657d68a377d43823a6ecb11",
+                    "mixHash" : "0x0ee74528156e3c25165bf844001c20fde3aaa82b4606663c54671c065f685ffe",
+                    "nonce" : "0x7ea68562950df224",
+                    "number" : "0x01",
+                    "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
+                    "receiptTrie" : "0xaa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79",
+                    "stateRoot" : "0x4508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0aa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a00ee74528156e3c25165bf844001c20fde3aaa82b4606663c54671c065f685ffe887ea68562950df224f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x02c308",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234e",
+                        "s" : "0x28495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4a8c0041b47e1b2904389436c371670fef40c9edc657d68a377d43823a6ecb11",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503e7",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g1v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g1v1.json
index 91577f4f1..8e45ae853 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g1v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g1v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertSubCallStorageOOG2_d0g1v1_EIP150" : {
+    "RevertSubCallStorageOOG2_d0g1v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c308",
-                    "hash" : "0x655c849ce85fbe917fc9b869ddbad79b2ca2838a10fef6f57677ca1e80012c5c",
-                    "mixHash" : "0x2c61f5eaebb613cfe2f668a514437b07630385de0a71c71792e298adb6a5403b",
-                    "nonce" : "0x1f350ab7a54e613c",
+                    "hash" : "0x379884c2ed341d49a1d4e2fa9b54691a1b335587a3d3303fb3f2fe42f0eb3002",
+                    "mixHash" : "0xbc447533be5a2b2419f4e228bb6f632f52e2821c6d98f0cd34e82079561f422a",
+                    "nonce" : "0x461a9d1761549dd0",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
-                    "receiptTrie" : "0xceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635",
-                    "stateRoot" : "0x1ec08514a54a4d9dc8ebcd5b4e2f02ad6428ecc8ad85ce49af0019f69dda1a74",
+                    "receiptTrie" : "0xa0e59dd82470f49ac8e90225d6d4478de021b3e726e5bddd464b6b763766a937",
+                    "stateRoot" : "0x013ac40abce54c3100c9f0cbe7ec70da3aaa9424172b640f70ce4e9d1498f5b6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ec08514a54a4d9dc8ebcd5b4e2f02ad6428ecc8ad85ce49af0019f69dda1a74a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0ceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a02c61f5eaebb613cfe2f668a514437b07630385de0a71c71792e298adb6a5403b881f350ab7a54e613cf866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0013ac40abce54c3100c9f0cbe7ec70da3aaa9424172b640f70ce4e9d1498f5b6a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0a0e59dd82470f49ac8e90225d6d4478de021b3e726e5bddd464b6b763766a937b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0bc447533be5a2b2419f4e228bb6f632f52e2821c6d98f0cd34e82079561f422a88461a9d1761549dd0f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x655c849ce85fbe917fc9b869ddbad79b2ca2838a10fef6f57677ca1e80012c5c",
-        "network" : "EIP150",
+        "lastblockhash" : "0x379884c2ed341d49a1d4e2fa9b54691a1b335587a3d3303fb3f2fe42f0eb3002",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c308",
                 "code" : "",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG2_d0g1v1_EIP158" : {
+    "RevertSubCallStorageOOG2_d0g1v1_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c308",
-                    "hash" : "0xf94fa7628930740d44dbc7c2064ba838c7c95d4083ff2bc4e7f6ef6b996e9104",
-                    "mixHash" : "0xd9a8ca25c2a9b87591db2964d4175a8558ad7e317bebd984f4c35dff893bc270",
-                    "nonce" : "0x8fd4b61a4eea9347",
+                    "hash" : "0xd28331d0198d5bb6c25d36a797ee2699ea71ac966e1feb63cf2dee9adbd19bcb",
+                    "mixHash" : "0x8fb58b31b699f75c0f0535bce3f50702d9a48c6fa45efd4e1964f7cb7a1e9c48",
+                    "nonce" : "0xde3eadc22c27ae22",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
-                    "receiptTrie" : "0xceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635",
-                    "stateRoot" : "0x1ec08514a54a4d9dc8ebcd5b4e2f02ad6428ecc8ad85ce49af0019f69dda1a74",
+                    "receiptTrie" : "0xa0e59dd82470f49ac8e90225d6d4478de021b3e726e5bddd464b6b763766a937",
+                    "stateRoot" : "0x013ac40abce54c3100c9f0cbe7ec70da3aaa9424172b640f70ce4e9d1498f5b6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ec08514a54a4d9dc8ebcd5b4e2f02ad6428ecc8ad85ce49af0019f69dda1a74a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0ceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0d9a8ca25c2a9b87591db2964d4175a8558ad7e317bebd984f4c35dff893bc270888fd4b61a4eea9347f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0013ac40abce54c3100c9f0cbe7ec70da3aaa9424172b640f70ce4e9d1498f5b6a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0a0e59dd82470f49ac8e90225d6d4478de021b3e726e5bddd464b6b763766a937b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a08fb58b31b699f75c0f0535bce3f50702d9a48c6fa45efd4e1964f7cb7a1e9c4888de3eadc22c27ae22f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf94fa7628930740d44dbc7c2064ba838c7c95d4083ff2bc4e7f6ef6b996e9104",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd28331d0198d5bb6c25d36a797ee2699ea71ac966e1feb63cf2dee9adbd19bcb",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c308",
                 "code" : "",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG2_d0g1v1_Frontier" : {
+    "RevertSubCallStorageOOG2_d0g1v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c308",
-                    "hash" : "0x706b97c924f05533105f9569375b5e702acd73e895345780415ea72924ebb8e7",
-                    "mixHash" : "0xe94c5f579f6ec2e71b0434e979cfc01f621e2cece58e5d102621c48c1fab3411",
-                    "nonce" : "0xd7c1afad2efc7d37",
+                    "hash" : "0xae0c4c60695f01ed4019d70874ff92aaa93137ec27e6e97a3830d0b9f20a9ab7",
+                    "mixHash" : "0xf9d506906f08d0ee41ee877ecf6dc6953884d08fb7f7e5b550ca82ffb0ab762e",
+                    "nonce" : "0x7b7a914e1c8d494d",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
                     "receiptTrie" : "0xceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0xb415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ec08514a54a4d9dc8ebcd5b4e2f02ad6428ecc8ad85ce49af0019f69dda1a74a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0ceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0e94c5f579f6ec2e71b0434e979cfc01f621e2cece58e5d102621c48c1fab341188d7c1afad2efc7d37f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ec08514a54a4d9dc8ebcd5b4e2f02ad6428ecc8ad85ce49af0019f69dda1a74a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0ceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0f9d506906f08d0ee41ee877ecf6dc6953884d08fb7f7e5b550ca82ffb0ab762e887b7a914e1c8d494df866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x706b97c924f05533105f9569375b5e702acd73e895345780415ea72924ebb8e7",
-        "network" : "Frontier",
+        "lastblockhash" : "0xae0c4c60695f01ed4019d70874ff92aaa93137ec27e6e97a3830d0b9f20a9ab7",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c308",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG2_d0g1v1_Homestead" : {
+    "RevertSubCallStorageOOG2_d0g1v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c308",
-                    "hash" : "0xc341478dad8ac9f64b4434d9782a3d5b737316d2b186dbb4c190a2e9ad60a2d8",
-                    "mixHash" : "0x4c6bb15bf59e15332978904d4f78874eaffbe42de9379cf2f6c915553b88b3d7",
-                    "nonce" : "0x9e304edc7a4dbaaf",
+                    "hash" : "0x3359a9469f5a81ea95b300776313691bba4465fe9c3057334f35ffe6c8a2734d",
+                    "mixHash" : "0xcf39ac0d3d368bd5e44b6fba01c0c0e0187f6717041640b64b9ce44085c91eca",
+                    "nonce" : "0x06850af880ab275c",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
                     "receiptTrie" : "0xceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0xb415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ec08514a54a4d9dc8ebcd5b4e2f02ad6428ecc8ad85ce49af0019f69dda1a74a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0ceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a04c6bb15bf59e15332978904d4f78874eaffbe42de9379cf2f6c915553b88b3d7889e304edc7a4dbaaff866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ec08514a54a4d9dc8ebcd5b4e2f02ad6428ecc8ad85ce49af0019f69dda1a74a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0ceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0cf39ac0d3d368bd5e44b6fba01c0c0e0187f6717041640b64b9ce44085c91eca8806850af880ab275cf866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc341478dad8ac9f64b4434d9782a3d5b737316d2b186dbb4c190a2e9ad60a2d8",
-        "network" : "Homestead",
+        "lastblockhash" : "0x3359a9469f5a81ea95b300776313691bba4465fe9c3057334f35ffe6c8a2734d",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c308",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG2_d0g1v1_Metropolis" : {
+    "RevertSubCallStorageOOG2_d0g1v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c308",
-                    "hash" : "0x70176d04e7805df5bda3af0ca066ecfcec0785c58caefa6370d004711bcae897",
-                    "mixHash" : "0xc0488b46bc97855ab920b2fba118c8c3c5f6fc83390834261361149f12579683",
-                    "nonce" : "0x187aeae444a376c3",
+                    "hash" : "0x200877e7ccb8b2f68d004e02c2e8d109132a74c3bb90661a848f281bc745b3e8",
+                    "mixHash" : "0xb2a5c96ccfd1bcc344a6dd7713726133ccb49159615b219dbc1ce0fd1d728a34",
+                    "nonce" : "0x96ae09adb29fb319",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
-                    "receiptTrie" : "0xa0e59dd82470f49ac8e90225d6d4478de021b3e726e5bddd464b6b763766a937",
-                    "stateRoot" : "0x013ac40abce54c3100c9f0cbe7ec70da3aaa9424172b640f70ce4e9d1498f5b6",
+                    "receiptTrie" : "0xceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635",
+                    "stateRoot" : "0x1ec08514a54a4d9dc8ebcd5b4e2f02ad6428ecc8ad85ce49af0019f69dda1a74",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0013ac40abce54c3100c9f0cbe7ec70da3aaa9424172b640f70ce4e9d1498f5b6a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0a0e59dd82470f49ac8e90225d6d4478de021b3e726e5bddd464b6b763766a937b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0c0488b46bc97855ab920b2fba118c8c3c5f6fc83390834261361149f1257968388187aeae444a376c3f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ec08514a54a4d9dc8ebcd5b4e2f02ad6428ecc8ad85ce49af0019f69dda1a74a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0ceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0b2a5c96ccfd1bcc344a6dd7713726133ccb49159615b219dbc1ce0fd1d728a348896ae09adb29fb319f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x70176d04e7805df5bda3af0ca066ecfcec0785c58caefa6370d004711bcae897",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x200877e7ccb8b2f68d004e02c2e8d109132a74c3bb90661a848f281bc745b3e8",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f6c308",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600081905550600e6001819055505b905600a165627a7a72305820b7c6987c21e63fed8a74d899557744a3be8d3fda191ce0f56cf261d6b860f6b40029",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a24cf8",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600081905550600e6001819055505b905600a165627a7a72305820b7c6987c21e63fed8a74d899557744a3be8d3fda191ce0f56cf261d6b860f6b40029",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertSubCallStorageOOG2_d0g1v1_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g1v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x02c308",
+                    "hash" : "0xbf1e6eb8c6af4203f13ca52f17f709445c61872ea322f9ccbcc87ccf5d7a4dd5",
+                    "mixHash" : "0xd3345d4331f01af3682bb2c011c993372350eda08a40d4315cab61041a1f5bbc",
+                    "nonce" : "0xbdd7b86b68a0d146",
+                    "number" : "0x01",
+                    "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
+                    "receiptTrie" : "0xceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635",
+                    "stateRoot" : "0x1ec08514a54a4d9dc8ebcd5b4e2f02ad6428ecc8ad85ce49af0019f69dda1a74",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ec08514a54a4d9dc8ebcd5b4e2f02ad6428ecc8ad85ce49af0019f69dda1a74a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0ceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0d3345d4331f01af3682bb2c011c993372350eda08a40d4315cab61041a1f5bbc88bdd7b86b68a0d146f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x02c308",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93fa",
+                        "s" : "0x26ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbf1e6eb8c6af4203f13ca52f17f709445c61872ea322f9ccbcc87ccf5d7a4dd5",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c308",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g0v0.json
index 30428382d..f97010bc6 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertSubCallStorageOOG_d0g0v0_EIP150" : {
+    "RevertSubCallStorageOOG_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/stRevertTest/RevertSubCallStorageOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013c68",
-                    "hash" : "0x7d2a8d43f8f700b5acccc25256f548f670158e854333b9f073c38666f79d0ed4",
-                    "mixHash" : "0xd4d343cc7b7e80517c8f4af0545c87c3f8d687e261454520a59fdd984af80983",
-                    "nonce" : "0x51ec4484a611396c",
+                    "hash" : "0xc75ac5d7de8814bbb78a5c1964a9d95f7e4eb23cd473a74a1e7183b41d6850cb",
+                    "mixHash" : "0x3cdda49e3b236ce85a7254f28c5acef47e5acd6f5b8f8bf915588eacc02040c8",
+                    "nonce" : "0x7bdeb1c0415f4256",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
-                    "receiptTrie" : "0x55247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1f",
-                    "stateRoot" : "0x890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10d",
+                    "receiptTrie" : "0x2281238d90b06f758a6c25fcd6a34375d8606cd2891dada916c1869a7dc7d374",
+                    "stateRoot" : "0x2b78525222570e3aa92e149713f78d6704d0dfc8b4d08720253325825ce18c86",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x699077c1219907b6d097942f9911f0abd918edf1276ce80f7db7661700305cda",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10da0699077c1219907b6d097942f9911f0abd918edf1276ce80f7db7661700305cdaa055247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a0d4d343cc7b7e80517c8f4af0545c87c3f8d687e261454520a59fdd984af809838851ec4484a611396cf866f864800183013c6894a0000000000000000000000000000000000000008084c04062261ca0b2a7a2dbbda29ce64fe107d670e2d79a7c365220045992cddafbf0c2239abe49a022e4f2d3aabf2d49525c453825f1e4194a4a6399c3d42f524c6addb812e9d0ddc0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b78525222570e3aa92e149713f78d6704d0dfc8b4d08720253325825ce18c86a0699077c1219907b6d097942f9911f0abd918edf1276ce80f7db7661700305cdaa02281238d90b06f758a6c25fcd6a34375d8606cd2891dada916c1869a7dc7d374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a03cdda49e3b236ce85a7254f28c5acef47e5acd6f5b8f8bf915588eacc02040c8887bdeb1c0415f4256f866f864800183013c6894a0000000000000000000000000000000000000008084c04062261ca0b2a7a2dbbda29ce64fe107d670e2d79a7c365220045992cddafbf0c2239abe49a022e4f2d3aabf2d49525c453825f1e4194a4a6399c3d42f524c6addb812e9d0ddc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7d2a8d43f8f700b5acccc25256f548f670158e854333b9f073c38666f79d0ed4",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc75ac5d7de8814bbb78a5c1964a9d95f7e4eb23cd473a74a1e7183b41d6850cb",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53c68",
                 "code" : "",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG_d0g0v0_EIP158" : {
+    "RevertSubCallStorageOOG_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/stRevertTest/RevertSubCallStorageOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013c68",
-                    "hash" : "0x8c5d57e4fc91c760275e743c7b8b440be58ea5ff7dabc98f90d19ecfde35a6e5",
-                    "mixHash" : "0x0d0f679a6f14c67ebe18941b9c6ab0ac9c1559477dfae7ecbccb0a1ae6269cc7",
-                    "nonce" : "0xd3e6dbe7debe35bb",
+                    "hash" : "0xa907c654a14a03a560aa6b374b82fc7f46cf6ea57c844f0bbdea0b96a3a8335d",
+                    "mixHash" : "0xebfa0d349c63a1e4d0db40c4d2460e275e6fe1311a1a613ee455dfee9d499a5b",
+                    "nonce" : "0xe3d8264451e125aa",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
-                    "receiptTrie" : "0x55247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1f",
-                    "stateRoot" : "0x890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10d",
+                    "receiptTrie" : "0x2281238d90b06f758a6c25fcd6a34375d8606cd2891dada916c1869a7dc7d374",
+                    "stateRoot" : "0x2b78525222570e3aa92e149713f78d6704d0dfc8b4d08720253325825ce18c86",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x699077c1219907b6d097942f9911f0abd918edf1276ce80f7db7661700305cda",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10da0699077c1219907b6d097942f9911f0abd918edf1276ce80f7db7661700305cdaa055247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a00d0f679a6f14c67ebe18941b9c6ab0ac9c1559477dfae7ecbccb0a1ae6269cc788d3e6dbe7debe35bbf866f864800183013c6894a0000000000000000000000000000000000000008084c04062261ca0b2a7a2dbbda29ce64fe107d670e2d79a7c365220045992cddafbf0c2239abe49a022e4f2d3aabf2d49525c453825f1e4194a4a6399c3d42f524c6addb812e9d0ddc0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b78525222570e3aa92e149713f78d6704d0dfc8b4d08720253325825ce18c86a0699077c1219907b6d097942f9911f0abd918edf1276ce80f7db7661700305cdaa02281238d90b06f758a6c25fcd6a34375d8606cd2891dada916c1869a7dc7d374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a0ebfa0d349c63a1e4d0db40c4d2460e275e6fe1311a1a613ee455dfee9d499a5b88e3d8264451e125aaf866f864800183013c6894a0000000000000000000000000000000000000008084c04062261ca0b2a7a2dbbda29ce64fe107d670e2d79a7c365220045992cddafbf0c2239abe49a022e4f2d3aabf2d49525c453825f1e4194a4a6399c3d42f524c6addb812e9d0ddc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8c5d57e4fc91c760275e743c7b8b440be58ea5ff7dabc98f90d19ecfde35a6e5",
-        "network" : "EIP158",
+        "lastblockhash" : "0xa907c654a14a03a560aa6b374b82fc7f46cf6ea57c844f0bbdea0b96a3a8335d",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53c68",
                 "code" : "",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG_d0g0v0_Frontier" : {
+    "RevertSubCallStorageOOG_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/stRevertTest/RevertSubCallStorageOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013c68",
-                    "hash" : "0x5b6e0f655c30843f88daee7da7a3ad7bb5be0dc4a5b9a2d0a7f1526d2cdcc46a",
-                    "mixHash" : "0x938d165c6a62d34920359ad37cc375ab1141f567286a872d6b394b4c13b2b216",
-                    "nonce" : "0x482f57d22e66ed71",
+                    "hash" : "0x9821f44096c01dc5c12941ac3720f5b1ed8eb57eaa7fd1a58c01bbd422afb6f3",
+                    "mixHash" : "0x1f7412b9734bef2ae6800150277e3857af4f5cf8abe077c530388b7007003cbe",
+                    "nonce" : "0x9d30380a21f0aba4",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
                     "receiptTrie" : "0x55247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1f",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x699077c1219907b6d097942f9911f0abd918edf1276ce80f7db7661700305cda",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10da0699077c1219907b6d097942f9911f0abd918edf1276ce80f7db7661700305cdaa055247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a0938d165c6a62d34920359ad37cc375ab1141f567286a872d6b394b4c13b2b21688482f57d22e66ed71f866f864800183013c6894a0000000000000000000000000000000000000008084c04062261ca0b2a7a2dbbda29ce64fe107d670e2d79a7c365220045992cddafbf0c2239abe49a022e4f2d3aabf2d49525c453825f1e4194a4a6399c3d42f524c6addb812e9d0ddc0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10da0699077c1219907b6d097942f9911f0abd918edf1276ce80f7db7661700305cdaa055247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a01f7412b9734bef2ae6800150277e3857af4f5cf8abe077c530388b7007003cbe889d30380a21f0aba4f866f864800183013c6894a0000000000000000000000000000000000000008084c04062261ca0b2a7a2dbbda29ce64fe107d670e2d79a7c365220045992cddafbf0c2239abe49a022e4f2d3aabf2d49525c453825f1e4194a4a6399c3d42f524c6addb812e9d0ddc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5b6e0f655c30843f88daee7da7a3ad7bb5be0dc4a5b9a2d0a7f1526d2cdcc46a",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9821f44096c01dc5c12941ac3720f5b1ed8eb57eaa7fd1a58c01bbd422afb6f3",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53c68",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG_d0g0v0_Homestead" : {
+    "RevertSubCallStorageOOG_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/stRevertTest/RevertSubCallStorageOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013c68",
-                    "hash" : "0x282f7a7cae05b034234a6b7a9208e3fca5c64ed1284936ebba302ec201f1cf17",
-                    "mixHash" : "0xa153c66476573a8b05d7b7e4b5469edb427f693be3659faf60f8b2c8ffee7be4",
-                    "nonce" : "0x9bcb81065f34001b",
+                    "hash" : "0xa1cabefcf0ab60455aa99619bb8c9457792e1facce5eeae7da0b47453aa2d5e1",
+                    "mixHash" : "0x66b194b2148576bf78d1a8d92d2845f35001ba32dabf6de55c14754531139d7c",
+                    "nonce" : "0xfdb034b2fde39f61",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
                     "receiptTrie" : "0x55247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1f",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x699077c1219907b6d097942f9911f0abd918edf1276ce80f7db7661700305cda",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10da0699077c1219907b6d097942f9911f0abd918edf1276ce80f7db7661700305cdaa055247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a0a153c66476573a8b05d7b7e4b5469edb427f693be3659faf60f8b2c8ffee7be4889bcb81065f34001bf866f864800183013c6894a0000000000000000000000000000000000000008084c04062261ca0b2a7a2dbbda29ce64fe107d670e2d79a7c365220045992cddafbf0c2239abe49a022e4f2d3aabf2d49525c453825f1e4194a4a6399c3d42f524c6addb812e9d0ddc0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10da0699077c1219907b6d097942f9911f0abd918edf1276ce80f7db7661700305cdaa055247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a066b194b2148576bf78d1a8d92d2845f35001ba32dabf6de55c14754531139d7c88fdb034b2fde39f61f866f864800183013c6894a0000000000000000000000000000000000000008084c04062261ca0b2a7a2dbbda29ce64fe107d670e2d79a7c365220045992cddafbf0c2239abe49a022e4f2d3aabf2d49525c453825f1e4194a4a6399c3d42f524c6addb812e9d0ddc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x282f7a7cae05b034234a6b7a9208e3fca5c64ed1284936ebba302ec201f1cf17",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa1cabefcf0ab60455aa99619bb8c9457792e1facce5eeae7da0b47453aa2d5e1",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53c68",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG_d0g0v0_Metropolis" : {
+    "RevertSubCallStorageOOG_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/stRevertTest/RevertSubCallStorageOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013c68",
-                    "hash" : "0xd7f04528b2333e3685475298670104a195521915c7889be36bc577198d685d32",
-                    "mixHash" : "0xcf008c18ac92f09cc119b99d2280d092f8e8afca50214a3bf3d038d64d620e42",
-                    "nonce" : "0x717bfe9415f7c137",
+                    "hash" : "0x63fc817234aed08694493745973e7b9c987f33981d18bf1333def07983a6fe5d",
+                    "mixHash" : "0xd913663414f69ce90a52ae99aeae44d135129efbfb431d08579d985831f644f5",
+                    "nonce" : "0x04ff6cb301be599c",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
-                    "receiptTrie" : "0x2281238d90b06f758a6c25fcd6a34375d8606cd2891dada916c1869a7dc7d374",
-                    "stateRoot" : "0x2b78525222570e3aa92e149713f78d6704d0dfc8b4d08720253325825ce18c86",
+                    "receiptTrie" : "0x55247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1f",
+                    "stateRoot" : "0x890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x699077c1219907b6d097942f9911f0abd918edf1276ce80f7db7661700305cda",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b78525222570e3aa92e149713f78d6704d0dfc8b4d08720253325825ce18c86a0699077c1219907b6d097942f9911f0abd918edf1276ce80f7db7661700305cdaa02281238d90b06f758a6c25fcd6a34375d8606cd2891dada916c1869a7dc7d374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a0cf008c18ac92f09cc119b99d2280d092f8e8afca50214a3bf3d038d64d620e4288717bfe9415f7c137f866f864800183013c6894a0000000000000000000000000000000000000008084c04062261ca0b2a7a2dbbda29ce64fe107d670e2d79a7c365220045992cddafbf0c2239abe49a022e4f2d3aabf2d49525c453825f1e4194a4a6399c3d42f524c6addb812e9d0ddc0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10da0699077c1219907b6d097942f9911f0abd918edf1276ce80f7db7661700305cdaa055247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a0d913663414f69ce90a52ae99aeae44d135129efbfb431d08579d985831f644f58804ff6cb301be599cf866f864800183013c6894a0000000000000000000000000000000000000008084c04062261ca0b2a7a2dbbda29ce64fe107d670e2d79a7c365220045992cddafbf0c2239abe49a022e4f2d3aabf2d49525c453825f1e4194a4a6399c3d42f524c6addb812e9d0ddc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd7f04528b2333e3685475298670104a195521915c7889be36bc577198d685d32",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x63fc817234aed08694493745973e7b9c987f33981d18bf1333def07983a6fe5d",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f53c68",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600181905550600e600281905550600190505b905600a165627a7a723058202a8a75d7d795b5bcb9042fb18b283daa90b999a11ddec892f548732235342eb60029",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3d398",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600181905550600e600281905550600190505b905600a165627a7a723058202a8a75d7d795b5bcb9042fb18b283daa90b999a11ddec892f548732235342eb60029",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertSubCallStorageOOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x013c68",
+                    "hash" : "0xe827a532603c9eb522b6fc8569fd5feb29e04be96a0945f3e5cea31fa2254904",
+                    "mixHash" : "0x8e910d410864f80545cffdfb223f312984fc1b011578f08fd13354b7b57f3a75",
+                    "nonce" : "0x73d865b6e79374c8",
+                    "number" : "0x01",
+                    "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
+                    "receiptTrie" : "0x55247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1f",
+                    "stateRoot" : "0x890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x699077c1219907b6d097942f9911f0abd918edf1276ce80f7db7661700305cda",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10da0699077c1219907b6d097942f9911f0abd918edf1276ce80f7db7661700305cdaa055247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a08e910d410864f80545cffdfb223f312984fc1b011578f08fd13354b7b57f3a758873d865b6e79374c8f866f864800183013c6894a0000000000000000000000000000000000000008084c04062261ca0b2a7a2dbbda29ce64fe107d670e2d79a7c365220045992cddafbf0c2239abe49a022e4f2d3aabf2d49525c453825f1e4194a4a6399c3d42f524c6addb812e9d0ddc0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x013c68",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb2a7a2dbbda29ce64fe107d670e2d79a7c365220045992cddafbf0c2239abe49",
+                        "s" : "0x22e4f2d3aabf2d49525c453825f1e4194a4a6399c3d42f524c6addb812e9d0dd",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe827a532603c9eb522b6fc8569fd5feb29e04be96a0945f3e5cea31fa2254904",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53c68",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g0v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g0v1.json
index 2ab38f01e..5783ce6db 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g0v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g0v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertSubCallStorageOOG_d0g0v1_EIP150" : {
+    "RevertSubCallStorageOOG_d0g0v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013c68",
-                    "hash" : "0xed4dc6b754e198e4294a4bbe6b9b3b010f818650f32c5254bb222b4ea546cf86",
-                    "mixHash" : "0xd8c895b691d35df30d0341d4f87ac5464dc9c1aad86558647d71edf58a38007b",
-                    "nonce" : "0xfff5164a174c4460",
+                    "hash" : "0x1a29632c0ac00b22d10c60e9f33f6d139ed19c7cbbabb408eebd3e83db22cfbf",
+                    "mixHash" : "0x5f401618eeb129e0e03078dafe6c448bbb74d53c7d9baf04f1e3cf7a9c3789f7",
+                    "nonce" : "0xce07f4ad6e85645f",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
-                    "receiptTrie" : "0x55247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1f",
-                    "stateRoot" : "0x890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10d",
+                    "receiptTrie" : "0x2281238d90b06f758a6c25fcd6a34375d8606cd2891dada916c1869a7dc7d374",
+                    "stateRoot" : "0x2b78525222570e3aa92e149713f78d6704d0dfc8b4d08720253325825ce18c86",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x73fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10da073fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751ca055247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a0d8c895b691d35df30d0341d4f87ac5464dc9c1aad86558647d71edf58a38007b88fff5164a174c4460f866f864800183013c6894a0000000000000000000000000000000000000000184c04062261ba08a01d6ce6e532476b173cbd56cbad66cdae73c23b986d6a8c1a8180d07e24c3fa045e60960797678679e5874b38b89a5cfc788d969928eb97302ed39e62c66af18c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b78525222570e3aa92e149713f78d6704d0dfc8b4d08720253325825ce18c86a073fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751ca02281238d90b06f758a6c25fcd6a34375d8606cd2891dada916c1869a7dc7d374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a05f401618eeb129e0e03078dafe6c448bbb74d53c7d9baf04f1e3cf7a9c3789f788ce07f4ad6e85645ff866f864800183013c6894a0000000000000000000000000000000000000000184c04062261ba08a01d6ce6e532476b173cbd56cbad66cdae73c23b986d6a8c1a8180d07e24c3fa045e60960797678679e5874b38b89a5cfc788d969928eb97302ed39e62c66af18c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xed4dc6b754e198e4294a4bbe6b9b3b010f818650f32c5254bb222b4ea546cf86",
-        "network" : "EIP150",
+        "lastblockhash" : "0x1a29632c0ac00b22d10c60e9f33f6d139ed19c7cbbabb408eebd3e83db22cfbf",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53c68",
                 "code" : "",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG_d0g0v1_EIP158" : {
+    "RevertSubCallStorageOOG_d0g0v1_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013c68",
-                    "hash" : "0x09bf8d1c3db70df17188d517d433a5305ee5e757b5a58afca3dd4e00bfc30229",
-                    "mixHash" : "0x3bc31ed095b31627f32b02887c13f94f0b4fc8bc05e7821842b0a49ad3d8d7dc",
-                    "nonce" : "0xab447d6c86ce1dfe",
+                    "hash" : "0xe8cae1d186e26d2521d5e9ba280d535de81d6181470617fdca0a91cf00abed9c",
+                    "mixHash" : "0x0cb1c47af0fe88b5829f9e2609c80721b384db50c2e435dcdf8830ffba6b819a",
+                    "nonce" : "0x7796ae2a5b5e017c",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
-                    "receiptTrie" : "0x55247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1f",
-                    "stateRoot" : "0x890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10d",
+                    "receiptTrie" : "0x2281238d90b06f758a6c25fcd6a34375d8606cd2891dada916c1869a7dc7d374",
+                    "stateRoot" : "0x2b78525222570e3aa92e149713f78d6704d0dfc8b4d08720253325825ce18c86",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x73fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10da073fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751ca055247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a03bc31ed095b31627f32b02887c13f94f0b4fc8bc05e7821842b0a49ad3d8d7dc88ab447d6c86ce1dfef866f864800183013c6894a0000000000000000000000000000000000000000184c04062261ba08a01d6ce6e532476b173cbd56cbad66cdae73c23b986d6a8c1a8180d07e24c3fa045e60960797678679e5874b38b89a5cfc788d969928eb97302ed39e62c66af18c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b78525222570e3aa92e149713f78d6704d0dfc8b4d08720253325825ce18c86a073fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751ca02281238d90b06f758a6c25fcd6a34375d8606cd2891dada916c1869a7dc7d374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a00cb1c47af0fe88b5829f9e2609c80721b384db50c2e435dcdf8830ffba6b819a887796ae2a5b5e017cf866f864800183013c6894a0000000000000000000000000000000000000000184c04062261ba08a01d6ce6e532476b173cbd56cbad66cdae73c23b986d6a8c1a8180d07e24c3fa045e60960797678679e5874b38b89a5cfc788d969928eb97302ed39e62c66af18c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x09bf8d1c3db70df17188d517d433a5305ee5e757b5a58afca3dd4e00bfc30229",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe8cae1d186e26d2521d5e9ba280d535de81d6181470617fdca0a91cf00abed9c",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53c68",
                 "code" : "",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG_d0g0v1_Frontier" : {
+    "RevertSubCallStorageOOG_d0g0v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013c68",
-                    "hash" : "0xb57eb2314e9c3a9f32d0dd830f0dcae9372b9c4a8a3d8d797222e0eaa0fe6fde",
-                    "mixHash" : "0x058e7acb3fabbb6bab3ab96511d3a061204e4077fa0b36cffa93aad55b236340",
-                    "nonce" : "0x277a452b8a1d4a08",
+                    "hash" : "0x5d0df2da461763d697c394cac0f44e092fe983448017802a361db5ddcb569805",
+                    "mixHash" : "0xa1c3c5c2a09cf1607b5b2d243546029c17a23630343acd4430b3e809c0e0bc73",
+                    "nonce" : "0x28ec7d0ee15b145b",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
                     "receiptTrie" : "0x55247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1f",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x73fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10da073fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751ca055247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a0058e7acb3fabbb6bab3ab96511d3a061204e4077fa0b36cffa93aad55b23634088277a452b8a1d4a08f866f864800183013c6894a0000000000000000000000000000000000000000184c04062261ba08a01d6ce6e532476b173cbd56cbad66cdae73c23b986d6a8c1a8180d07e24c3fa045e60960797678679e5874b38b89a5cfc788d969928eb97302ed39e62c66af18c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10da073fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751ca055247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a0a1c3c5c2a09cf1607b5b2d243546029c17a23630343acd4430b3e809c0e0bc738828ec7d0ee15b145bf866f864800183013c6894a0000000000000000000000000000000000000000184c04062261ba08a01d6ce6e532476b173cbd56cbad66cdae73c23b986d6a8c1a8180d07e24c3fa045e60960797678679e5874b38b89a5cfc788d969928eb97302ed39e62c66af18c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb57eb2314e9c3a9f32d0dd830f0dcae9372b9c4a8a3d8d797222e0eaa0fe6fde",
-        "network" : "Frontier",
+        "lastblockhash" : "0x5d0df2da461763d697c394cac0f44e092fe983448017802a361db5ddcb569805",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53c68",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG_d0g0v1_Homestead" : {
+    "RevertSubCallStorageOOG_d0g0v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013c68",
-                    "hash" : "0x9fc3ae2dfee559d952dd9b7df413850cd6fbab3cebb72f08e4af94cd7b3f3abd",
-                    "mixHash" : "0x1cbf3b2178143be10dbbcab558d654011f911b410fee9c6a893aa215afcc6c8d",
-                    "nonce" : "0x219fd473a0e7dc9c",
+                    "hash" : "0x30dabb3e3f78734292a4fb5ff47b9eaf27805394cb9fdbbb0178f4a1ae0b0904",
+                    "mixHash" : "0xe4627abf7dd5605a5006d1132a9bb79b7003d9100fe5089a1abb4277d4af07a9",
+                    "nonce" : "0xb04ce2c100c7fb4c",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
                     "receiptTrie" : "0x55247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1f",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x73fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10da073fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751ca055247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a01cbf3b2178143be10dbbcab558d654011f911b410fee9c6a893aa215afcc6c8d88219fd473a0e7dc9cf866f864800183013c6894a0000000000000000000000000000000000000000184c04062261ba08a01d6ce6e532476b173cbd56cbad66cdae73c23b986d6a8c1a8180d07e24c3fa045e60960797678679e5874b38b89a5cfc788d969928eb97302ed39e62c66af18c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10da073fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751ca055247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a0e4627abf7dd5605a5006d1132a9bb79b7003d9100fe5089a1abb4277d4af07a988b04ce2c100c7fb4cf866f864800183013c6894a0000000000000000000000000000000000000000184c04062261ba08a01d6ce6e532476b173cbd56cbad66cdae73c23b986d6a8c1a8180d07e24c3fa045e60960797678679e5874b38b89a5cfc788d969928eb97302ed39e62c66af18c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9fc3ae2dfee559d952dd9b7df413850cd6fbab3cebb72f08e4af94cd7b3f3abd",
-        "network" : "Homestead",
+        "lastblockhash" : "0x30dabb3e3f78734292a4fb5ff47b9eaf27805394cb9fdbbb0178f4a1ae0b0904",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53c68",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG_d0g0v1_Metropolis" : {
+    "RevertSubCallStorageOOG_d0g0v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013c68",
-                    "hash" : "0x9cc395a63c29a886e200ca11f9e062932d1aa90786853e133ae1e989d816e58c",
-                    "mixHash" : "0x230d47d87aac19c8891100d38f538e2889f05bb4e4e3b11896d12db11930f1b3",
-                    "nonce" : "0x510b397ed4c6b11e",
+                    "hash" : "0x9561edec0d4dee66aba3d3e76ad5c66dff6eb5ee037865403e1df1a4262e6b9f",
+                    "mixHash" : "0xfdda530d998782e9716ad3464280ec576360665533e9273d557a7a38fb991cda",
+                    "nonce" : "0xb39937d49dddd5d3",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
-                    "receiptTrie" : "0x2281238d90b06f758a6c25fcd6a34375d8606cd2891dada916c1869a7dc7d374",
-                    "stateRoot" : "0x2b78525222570e3aa92e149713f78d6704d0dfc8b4d08720253325825ce18c86",
+                    "receiptTrie" : "0x55247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1f",
+                    "stateRoot" : "0x890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x73fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b78525222570e3aa92e149713f78d6704d0dfc8b4d08720253325825ce18c86a073fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751ca02281238d90b06f758a6c25fcd6a34375d8606cd2891dada916c1869a7dc7d374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a0230d47d87aac19c8891100d38f538e2889f05bb4e4e3b11896d12db11930f1b388510b397ed4c6b11ef866f864800183013c6894a0000000000000000000000000000000000000000184c04062261ba08a01d6ce6e532476b173cbd56cbad66cdae73c23b986d6a8c1a8180d07e24c3fa045e60960797678679e5874b38b89a5cfc788d969928eb97302ed39e62c66af18c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10da073fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751ca055247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a0fdda530d998782e9716ad3464280ec576360665533e9273d557a7a38fb991cda88b39937d49dddd5d3f866f864800183013c6894a0000000000000000000000000000000000000000184c04062261ba08a01d6ce6e532476b173cbd56cbad66cdae73c23b986d6a8c1a8180d07e24c3fa045e60960797678679e5874b38b89a5cfc788d969928eb97302ed39e62c66af18c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9cc395a63c29a886e200ca11f9e062932d1aa90786853e133ae1e989d816e58c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9561edec0d4dee66aba3d3e76ad5c66dff6eb5ee037865403e1df1a4262e6b9f",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f53c68",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600181905550600e600281905550600190505b905600a165627a7a723058202a8a75d7d795b5bcb9042fb18b283daa90b999a11ddec892f548732235342eb60029",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3d398",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600181905550600e600281905550600190505b905600a165627a7a723058202a8a75d7d795b5bcb9042fb18b283daa90b999a11ddec892f548732235342eb60029",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertSubCallStorageOOG_d0g0v1_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG_d0g0v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x013c68",
+                    "hash" : "0xea54593088795d2ebead17d20def2c8da80f0b1b2be3073169fec80ee43c3876",
+                    "mixHash" : "0x32656774c6c75b0aef0b6e7527a6e869961c1b3656e12692cd54fcbd2a8d6f89",
+                    "nonce" : "0x4529f026a0d333ff",
+                    "number" : "0x01",
+                    "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
+                    "receiptTrie" : "0x55247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1f",
+                    "stateRoot" : "0x890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x73fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10da073fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751ca055247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a032656774c6c75b0aef0b6e7527a6e869961c1b3656e12692cd54fcbd2a8d6f89884529f026a0d333fff866f864800183013c6894a0000000000000000000000000000000000000000184c04062261ba08a01d6ce6e532476b173cbd56cbad66cdae73c23b986d6a8c1a8180d07e24c3fa045e60960797678679e5874b38b89a5cfc788d969928eb97302ed39e62c66af18c0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x013c68",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8a01d6ce6e532476b173cbd56cbad66cdae73c23b986d6a8c1a8180d07e24c3f",
+                        "s" : "0x45e60960797678679e5874b38b89a5cfc788d969928eb97302ed39e62c66af18",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xea54593088795d2ebead17d20def2c8da80f0b1b2be3073169fec80ee43c3876",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53c68",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g1v0.json
index fdcef1513..a99957cd2 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertSubCallStorageOOG_d0g1v0_EIP150" : {
+    "RevertSubCallStorageOOG_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013e87",
-                    "hash" : "0xcc9b7eb39e44b9a433a2897cf059970b3d3e0584d98b0745f0057de951139632",
-                    "mixHash" : "0xf76db8280910aaf5bbd0f85e8b110e9c651a5117aeab97bf028553d65a83e607",
-                    "nonce" : "0xc68dee296ea9dd81",
+                    "hash" : "0xb741308e0c9b3f167993958018de710b573c1b985e9739e5478d6dd04241ccf6",
+                    "mixHash" : "0x9ecb4c8a48450115c2fdefe6e2a3cfde93ca406ad24518884db79cc68906550e",
+                    "nonce" : "0xcd668fb59a93e055",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
-                    "receiptTrie" : "0xdf67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fd",
-                    "stateRoot" : "0x4f428ccc4170bf7377dd63c936104e171d4664d7cc4b4e718995819eed39a804",
+                    "receiptTrie" : "0xfedc027c1b8fe2b9436a1d8391842eb6c9d2cfa63b0dfd2ea7045fc0361cc2d3",
+                    "stateRoot" : "0x91a9cbffe185892b4222463dcac606cd49215f091f0527903221c7e13b9dd3bf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f428ccc4170bf7377dd63c936104e171d4664d7cc4b4e718995819eed39a804a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0df67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013e878203e880a0f76db8280910aaf5bbd0f85e8b110e9c651a5117aeab97bf028553d65a83e60788c68dee296ea9dd81f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091a9cbffe185892b4222463dcac606cd49215f091f0527903221c7e13b9dd3bfa00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0fedc027c1b8fe2b9436a1d8391842eb6c9d2cfa63b0dfd2ea7045fc0361cc2d3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013e878203e880a09ecb4c8a48450115c2fdefe6e2a3cfde93ca406ad24518884db79cc68906550e88cd668fb59a93e055f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcc9b7eb39e44b9a433a2897cf059970b3d3e0584d98b0745f0057de951139632",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb741308e0c9b3f167993958018de710b573c1b985e9739e5478d6dd04241ccf6",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53e87",
                 "code" : "",
@@ -107,10 +114,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG_d0g1v0_EIP158" : {
+    "RevertSubCallStorageOOG_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -122,18 +129,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013e87",
-                    "hash" : "0x8991b5994f720538e22cf92a52c3b374a1bb625a766802d7193a3ec528ebb6a5",
-                    "mixHash" : "0x0ef139003a5a9c02756c93d9ca4a78043cd22a28fa5d2056d8e3fc64d32dcdce",
-                    "nonce" : "0xe9b5a372a6566029",
+                    "hash" : "0x6e4a2b55ca901138c990dac111c86e4891eb45eff181cd1618623ab26607e670",
+                    "mixHash" : "0x0ef3672970ba37ad130cbee70a8eb6b581f0c2fcd279c04913f3ac3f611bbce9",
+                    "nonce" : "0x3efcb466770419cd",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
-                    "receiptTrie" : "0xdf67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fd",
-                    "stateRoot" : "0x4f428ccc4170bf7377dd63c936104e171d4664d7cc4b4e718995819eed39a804",
+                    "receiptTrie" : "0xfedc027c1b8fe2b9436a1d8391842eb6c9d2cfa63b0dfd2ea7045fc0361cc2d3",
+                    "stateRoot" : "0x91a9cbffe185892b4222463dcac606cd49215f091f0527903221c7e13b9dd3bf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f428ccc4170bf7377dd63c936104e171d4664d7cc4b4e718995819eed39a804a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0df67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013e878203e880a00ef139003a5a9c02756c93d9ca4a78043cd22a28fa5d2056d8e3fc64d32dcdce88e9b5a372a6566029f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091a9cbffe185892b4222463dcac606cd49215f091f0527903221c7e13b9dd3bfa00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0fedc027c1b8fe2b9436a1d8391842eb6c9d2cfa63b0dfd2ea7045fc0361cc2d3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013e878203e880a00ef3672970ba37ad130cbee70a8eb6b581f0c2fcd279c04913f3ac3f611bbce9883efcb466770419cdf866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -170,9 +177,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8991b5994f720538e22cf92a52c3b374a1bb625a766802d7193a3ec528ebb6a5",
-        "network" : "EIP158",
+        "lastblockhash" : "0x6e4a2b55ca901138c990dac111c86e4891eb45eff181cd1618623ab26607e670",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53e87",
                 "code" : "",
@@ -215,10 +229,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG_d0g1v0_Frontier" : {
+    "RevertSubCallStorageOOG_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -230,9 +244,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013e87",
-                    "hash" : "0x98451d1b56835613647d82a4141310a47fde25366eb4f731592de716b0bc1215",
-                    "mixHash" : "0xacbb7d46d025efe89ed617875887e61c39c632fc2cc86395d4aa89574d34239e",
-                    "nonce" : "0x0e74dbd999220766",
+                    "hash" : "0x01212ba958898d1d334cfacdfc6cd3c841e345df2fef81d8d602bbe4462d0f99",
+                    "mixHash" : "0x23baa679b60d338b5ea0848f697ed59726956f5d96c7a5646b52d0c51f15f6f5",
+                    "nonce" : "0xe9cead9c411c0b8d",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
                     "receiptTrie" : "0xdf67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fd",
@@ -241,7 +255,7 @@
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f428ccc4170bf7377dd63c936104e171d4664d7cc4b4e718995819eed39a804a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0df67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013e878203e880a0acbb7d46d025efe89ed617875887e61c39c632fc2cc86395d4aa89574d34239e880e74dbd999220766f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f428ccc4170bf7377dd63c936104e171d4664d7cc4b4e718995819eed39a804a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0df67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013e878203e880a023baa679b60d338b5ea0848f697ed59726956f5d96c7a5646b52d0c51f15f6f588e9cead9c411c0b8df866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -278,8 +292,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x98451d1b56835613647d82a4141310a47fde25366eb4f731592de716b0bc1215",
-        "network" : "Frontier",
+        "lastblockhash" : "0x01212ba958898d1d334cfacdfc6cd3c841e345df2fef81d8d602bbe4462d0f99",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53e87",
@@ -323,10 +337,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG_d0g1v0_Homestead" : {
+    "RevertSubCallStorageOOG_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -338,9 +352,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013e87",
-                    "hash" : "0xa9b118c9fc4c723c192c95500df27a0dd4d8e7c36bbd6dc26cdc75e253877b97",
-                    "mixHash" : "0xd68be5759680ba371908aea6ee0fb09514cddddb92dfe6460a06324ffbace2a4",
-                    "nonce" : "0x944d58ec5e4761e4",
+                    "hash" : "0x44fea9ce3e6807b956f094dfca2b6c9954546ad8195c0c6ae7c40dfb5cbbaa5d",
+                    "mixHash" : "0xc5c6e49e308e68b80cf7b806347bb28e102e2979247c70d195b869e8411f9ed0",
+                    "nonce" : "0xbf307256fc7090b0",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
                     "receiptTrie" : "0xdf67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fd",
@@ -349,7 +363,7 @@
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f428ccc4170bf7377dd63c936104e171d4664d7cc4b4e718995819eed39a804a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0df67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013e878203e880a0d68be5759680ba371908aea6ee0fb09514cddddb92dfe6460a06324ffbace2a488944d58ec5e4761e4f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f428ccc4170bf7377dd63c936104e171d4664d7cc4b4e718995819eed39a804a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0df67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013e878203e880a0c5c6e49e308e68b80cf7b806347bb28e102e2979247c70d195b869e8411f9ed088bf307256fc7090b0f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -386,8 +400,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa9b118c9fc4c723c192c95500df27a0dd4d8e7c36bbd6dc26cdc75e253877b97",
-        "network" : "Homestead",
+        "lastblockhash" : "0x44fea9ce3e6807b956f094dfca2b6c9954546ad8195c0c6ae7c40dfb5cbbaa5d",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53e87",
@@ -431,10 +445,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG_d0g1v0_Metropolis" : {
+    "RevertSubCallStorageOOG_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -446,18 +460,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013e87",
-                    "hash" : "0xbdc4fd93fbf5a60562e8e68ea85b58d316b320b286516ebeb6aeaa76a978596f",
-                    "mixHash" : "0xf12c4c956201ca62c4aa98aee826a030ea47047d0d2e78c76084fcf5a125f5e7",
-                    "nonce" : "0x95b36ceff7b017ad",
+                    "hash" : "0xced0ad3740c32c0dce9cae9bfe3d3681a45ee86265caf03b7555d96f857345d8",
+                    "mixHash" : "0x7a30a2859c10abc449e2f7225df381c50aa6ce1fceed44d88dd71d070b94749d",
+                    "nonce" : "0xb0f58ae4b8361288",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
-                    "receiptTrie" : "0xfedc027c1b8fe2b9436a1d8391842eb6c9d2cfa63b0dfd2ea7045fc0361cc2d3",
-                    "stateRoot" : "0x91a9cbffe185892b4222463dcac606cd49215f091f0527903221c7e13b9dd3bf",
+                    "receiptTrie" : "0xdf67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fd",
+                    "stateRoot" : "0x4f428ccc4170bf7377dd63c936104e171d4664d7cc4b4e718995819eed39a804",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091a9cbffe185892b4222463dcac606cd49215f091f0527903221c7e13b9dd3bfa00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0fedc027c1b8fe2b9436a1d8391842eb6c9d2cfa63b0dfd2ea7045fc0361cc2d3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013e878203e880a0f12c4c956201ca62c4aa98aee826a030ea47047d0d2e78c76084fcf5a125f5e78895b36ceff7b017adf866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f428ccc4170bf7377dd63c936104e171d4664d7cc4b4e718995819eed39a804a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0df67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013e878203e880a07a30a2859c10abc449e2f7225df381c50aa6ce1fceed44d88dd71d070b94749d88b0f58ae4b8361288f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -494,16 +508,117 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbdc4fd93fbf5a60562e8e68ea85b58d316b320b286516ebeb6aeaa76a978596f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xced0ad3740c32c0dce9cae9bfe3d3681a45ee86265caf03b7555d96f857345d8",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f53e87",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600181905550600e600281905550600190505b905600a165627a7a723058202a8a75d7d795b5bcb9042fb18b283daa90b999a11ddec892f548732235342eb60029",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x0c",
+                    "0x01" : "0x0d",
+                    "0x02" : "0x0e"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3d179",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600181905550600e600281905550600190505b905600a165627a7a723058202a8a75d7d795b5bcb9042fb18b283daa90b999a11ddec892f548732235342eb60029",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertSubCallStorageOOG_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x013e87",
+                    "hash" : "0xd8411cb05e3c5042ca6b6d6bbb88e1c5928b460b32f486d46aac5203c4d849d2",
+                    "mixHash" : "0x28cc26722bc5da5cfcc82bb4d4c6fe4390805ab090f191df6f4c3cb7df49f9c7",
+                    "nonce" : "0xbf71b3ead20cfe76",
+                    "number" : "0x01",
+                    "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
+                    "receiptTrie" : "0xdf67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fd",
+                    "stateRoot" : "0x4f428ccc4170bf7377dd63c936104e171d4664d7cc4b4e718995819eed39a804",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f428ccc4170bf7377dd63c936104e171d4664d7cc4b4e718995819eed39a804a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0df67adf3aee00da124e2e37fbca1893d2b93fdec2d84a234c92bba03c99cd7fdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013e878203e880a028cc26722bc5da5cfcc82bb4d4c6fe4390805ab090f191df6f4c3cb7df49f9c788bf71b3ead20cfe76f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x02c308",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234e",
+                        "s" : "0x28495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd8411cb05e3c5042ca6b6d6bbb88e1c5928b460b32f486d46aac5203c4d849d2",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53e87",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g1v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g1v1.json
index 10634a2e4..c8a7c6625 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g1v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g1v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertSubCallStorageOOG_d0g1v1_EIP150" : {
+    "RevertSubCallStorageOOG_d0g1v1_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c308",
-                    "hash" : "0x1fe51a675a320e3b5d32d02cffe8a6dd773469f52de569ab3a3f058db3997826",
-                    "mixHash" : "0xfcd4d2a7cf0b46ade5ebb9f42efeff7b7d2a1ddf8126fb2d8d83a51779316759",
-                    "nonce" : "0x86a174e86ccffebb",
+                    "hash" : "0xc7f7a628d0b9979403e748418f3636d021f9af732d58cebcadac024657e29e7a",
+                    "mixHash" : "0xbd552f46424729156ac16fd325dd9ea8f48f2284e0879e1d9786b2a4193f6677",
+                    "nonce" : "0xc5e0347674225477",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
-                    "receiptTrie" : "0x5cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196",
-                    "stateRoot" : "0x1ffcda6b66d61dbb242a4b582658c740bcc897357210c3d1928a7cc69a58b9a8",
+                    "receiptTrie" : "0xa0e59dd82470f49ac8e90225d6d4478de021b3e726e5bddd464b6b763766a937",
+                    "stateRoot" : "0xc6520d5ff3cd89d7c2dcc460b23d356cdaf3172d579f266b544232120372f274",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ffcda6b66d61dbb242a4b582658c740bcc897357210c3d1928a7cc69a58b9a8a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a05cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0fcd4d2a7cf0b46ade5ebb9f42efeff7b7d2a1ddf8126fb2d8d83a517793167598886a174e86ccffebbf866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c6520d5ff3cd89d7c2dcc460b23d356cdaf3172d579f266b544232120372f274a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0a0e59dd82470f49ac8e90225d6d4478de021b3e726e5bddd464b6b763766a937b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0bd552f46424729156ac16fd325dd9ea8f48f2284e0879e1d9786b2a4193f667788c5e0347674225477f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1fe51a675a320e3b5d32d02cffe8a6dd773469f52de569ab3a3f058db3997826",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc7f7a628d0b9979403e748418f3636d021f9af732d58cebcadac024657e29e7a",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c308",
                 "code" : "",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG_d0g1v1_EIP158" : {
+    "RevertSubCallStorageOOG_d0g1v1_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c308",
-                    "hash" : "0x389ea5faec54777b52e379c7d531d9fcaebb0733016f0d83f6a97d4cdba94289",
-                    "mixHash" : "0xd3e8c4e343cbd8abfa3051bf5171d739d2b4a2486845dd2e8d56b690bac7035d",
-                    "nonce" : "0xe5d81a70693ef203",
+                    "hash" : "0xcaf42a64c1a73f3fc9da48928c34cda902dd4563e359193bdf27ecdadcabdc17",
+                    "mixHash" : "0xd5b633763865cee8e84e8fa293550c9e62759e01db7950e010295300473c9987",
+                    "nonce" : "0x91305eb51e3ed937",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
-                    "receiptTrie" : "0x5cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196",
-                    "stateRoot" : "0x1ffcda6b66d61dbb242a4b582658c740bcc897357210c3d1928a7cc69a58b9a8",
+                    "receiptTrie" : "0xa0e59dd82470f49ac8e90225d6d4478de021b3e726e5bddd464b6b763766a937",
+                    "stateRoot" : "0xc6520d5ff3cd89d7c2dcc460b23d356cdaf3172d579f266b544232120372f274",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ffcda6b66d61dbb242a4b582658c740bcc897357210c3d1928a7cc69a58b9a8a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a05cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0d3e8c4e343cbd8abfa3051bf5171d739d2b4a2486845dd2e8d56b690bac7035d88e5d81a70693ef203f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c6520d5ff3cd89d7c2dcc460b23d356cdaf3172d579f266b544232120372f274a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0a0e59dd82470f49ac8e90225d6d4478de021b3e726e5bddd464b6b763766a937b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0d5b633763865cee8e84e8fa293550c9e62759e01db7950e010295300473c99878891305eb51e3ed937f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x389ea5faec54777b52e379c7d531d9fcaebb0733016f0d83f6a97d4cdba94289",
-        "network" : "EIP158",
+        "lastblockhash" : "0xcaf42a64c1a73f3fc9da48928c34cda902dd4563e359193bdf27ecdadcabdc17",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c308",
                 "code" : "",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG_d0g1v1_Frontier" : {
+    "RevertSubCallStorageOOG_d0g1v1_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c308",
-                    "hash" : "0xe9cd20bf543185fdb5acd5f0a1dc6b80804970b49285067bdeaa16d1b3c88431",
-                    "mixHash" : "0x354d2faace8d2f2060621813968ab9f7c076f9930bc518f416f801507414a039",
-                    "nonce" : "0x673e43d8f9b2723c",
+                    "hash" : "0x79439a97ba3d39119a4ead3fde76a33b841ea230472642d0b30263cbbde60f95",
+                    "mixHash" : "0x98512150f19334b54c190decec19654c7f90f2310bb57841e6c43e72c71df879",
+                    "nonce" : "0xf4aa16131c3003ca",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
                     "receiptTrie" : "0x5cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0xb415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ffcda6b66d61dbb242a4b582658c740bcc897357210c3d1928a7cc69a58b9a8a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a05cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0354d2faace8d2f2060621813968ab9f7c076f9930bc518f416f801507414a03988673e43d8f9b2723cf866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ffcda6b66d61dbb242a4b582658c740bcc897357210c3d1928a7cc69a58b9a8a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a05cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a098512150f19334b54c190decec19654c7f90f2310bb57841e6c43e72c71df87988f4aa16131c3003caf866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe9cd20bf543185fdb5acd5f0a1dc6b80804970b49285067bdeaa16d1b3c88431",
-        "network" : "Frontier",
+        "lastblockhash" : "0x79439a97ba3d39119a4ead3fde76a33b841ea230472642d0b30263cbbde60f95",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c308",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG_d0g1v1_Homestead" : {
+    "RevertSubCallStorageOOG_d0g1v1_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c308",
-                    "hash" : "0x1362dd1967a8f76ff3e0bc381bcdbd7a28b646574ad9a35fd528f2055c12e195",
-                    "mixHash" : "0x6e530a0eee5e73253e5eb875e25d945043b18dae60e370b4438a300aa21aa9e6",
-                    "nonce" : "0x2080ab5c36299cdb",
+                    "hash" : "0x96304bf3f42d34728510fc2031597573b5433130526c3121d2b76f821782fce5",
+                    "mixHash" : "0x2601b79af305502ac221a4391ad584ab70ffa82b03d46372f0db3d43a6631391",
+                    "nonce" : "0xa24d97b20ff045a9",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
                     "receiptTrie" : "0x5cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0xb415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ffcda6b66d61dbb242a4b582658c740bcc897357210c3d1928a7cc69a58b9a8a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a05cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a06e530a0eee5e73253e5eb875e25d945043b18dae60e370b4438a300aa21aa9e6882080ab5c36299cdbf866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ffcda6b66d61dbb242a4b582658c740bcc897357210c3d1928a7cc69a58b9a8a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a05cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a02601b79af305502ac221a4391ad584ab70ffa82b03d46372f0db3d43a663139188a24d97b20ff045a9f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1362dd1967a8f76ff3e0bc381bcdbd7a28b646574ad9a35fd528f2055c12e195",
-        "network" : "Homestead",
+        "lastblockhash" : "0x96304bf3f42d34728510fc2031597573b5433130526c3121d2b76f821782fce5",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c308",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG_d0g1v1_Metropolis" : {
+    "RevertSubCallStorageOOG_d0g1v1_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c308",
-                    "hash" : "0xcd630501bd5220c71cba4b80b8b3d4c0d43ed6be2e898bf71eee64e6bfad0e34",
-                    "mixHash" : "0x814dc29dee4d1a35173b64586e5c28311bce862658ad734c2e5a457962e18bba",
-                    "nonce" : "0x6e7ef990002909b1",
+                    "hash" : "0x4461baf248047ffedbb6ac8108294c98ecf1b20fd0103f404fb3435a446f7c74",
+                    "mixHash" : "0x24aefb301501e300d53ed386000c76fdbfa7f15346f5bc6cf75655ca05372325",
+                    "nonce" : "0x9cc223f95809169a",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
-                    "receiptTrie" : "0xa0e59dd82470f49ac8e90225d6d4478de021b3e726e5bddd464b6b763766a937",
-                    "stateRoot" : "0xc6520d5ff3cd89d7c2dcc460b23d356cdaf3172d579f266b544232120372f274",
+                    "receiptTrie" : "0x5cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196",
+                    "stateRoot" : "0x1ffcda6b66d61dbb242a4b582658c740bcc897357210c3d1928a7cc69a58b9a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c6520d5ff3cd89d7c2dcc460b23d356cdaf3172d579f266b544232120372f274a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0a0e59dd82470f49ac8e90225d6d4478de021b3e726e5bddd464b6b763766a937b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0814dc29dee4d1a35173b64586e5c28311bce862658ad734c2e5a457962e18bba886e7ef990002909b1f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ffcda6b66d61dbb242a4b582658c740bcc897357210c3d1928a7cc69a58b9a8a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a05cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a024aefb301501e300d53ed386000c76fdbfa7f15346f5bc6cf75655ca05372325889cc223f95809169af866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcd630501bd5220c71cba4b80b8b3d4c0d43ed6be2e898bf71eee64e6bfad0e34",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4461baf248047ffedbb6ac8108294c98ecf1b20fd0103f404fb3435a446f7c74",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f6c308",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600181905550600e600281905550600190505b905600a165627a7a723058202a8a75d7d795b5bcb9042fb18b283daa90b999a11ddec892f548732235342eb60029",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a24cf8",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600181905550600e600281905550600190505b905600a165627a7a723058202a8a75d7d795b5bcb9042fb18b283daa90b999a11ddec892f548732235342eb60029",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertSubCallStorageOOG_d0g1v1_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG_d0g1v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x02c308",
+                    "hash" : "0xfe7b97c09ae9c76690186803a4556e2dd6f0f2801cb8e56c832362f9619f0088",
+                    "mixHash" : "0x887c38590798f4b21ca98c407b45b72e3364b10f137e823994c5a7d9c5181461",
+                    "nonce" : "0x1c294eaa7bb93f34",
+                    "number" : "0x01",
+                    "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
+                    "receiptTrie" : "0x5cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196",
+                    "stateRoot" : "0x1ffcda6b66d61dbb242a4b582658c740bcc897357210c3d1928a7cc69a58b9a8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ffcda6b66d61dbb242a4b582658c740bcc897357210c3d1928a7cc69a58b9a8a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a05cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0887c38590798f4b21ca98c407b45b72e3364b10f137e823994c5a7d9c5181461881c294eaa7bb93f34f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x02c308",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93fa",
+                        "s" : "0x26ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfe7b97c09ae9c76690186803a4556e2dd6f0f2801cb8e56c832362f9619f0088",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c308",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert2_d0g0v0.json
index 83a021ae0..37976500c 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "TouchToEmptyAccountRevert2_d0g0v0_EIP150" : {
+    "TouchToEmptyAccountRevert2_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/stRevertTest/TouchToEmptyAccountRevert2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x012e58",
-                    "hash" : "0xd9e952e9704e6797c94ca16df50d019dc0370b178ffa99e2e654129e293cc1b9",
-                    "mixHash" : "0x05107a61eceb7b527d8a7f7a988ae32640666a05a10d8ce9fda6131f9333d6ba",
-                    "nonce" : "0xd7ea57c218244572",
+                    "hash" : "0x9721a384516a465152404d3188a791e5a0b1f49502cc32aabe7ded1e5937ae46",
+                    "mixHash" : "0x69060a8bc9f42bb5301506eebe7f5f69438a787b3230d221870a01aa8325a2a7",
+                    "nonce" : "0x119fdbd5e8a6e5f0",
                     "number" : "0x01",
                     "parentHash" : "0x3797f4aae251d4ab33e6ba76ba49712643045f4a2f45a243c683fc2891ed00b0",
-                    "receiptTrie" : "0x8d2a9f4020df8909ee5377aa470ad31a68259665bf392db364b3d31eb6ae7263",
-                    "stateRoot" : "0x8154e694a1619da171b31c9cf90fb316cbbc8821f1b39febd2fe413286aedb2a",
+                    "receiptTrie" : "0x41ca2a684b65e197e5164274ce8378f6886287548fd763dbd4d2131f421d9b06",
+                    "stateRoot" : "0xd3f78f18ea183fb8496ff2bafdf504098b92d9daa7add3c04e52c657ab616703",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2e42786e6ec04830fd0a77ce80f317a47b51dbbaed516c714d01fdbfc50a940d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03797f4aae251d4ab33e6ba76ba49712643045f4a2f45a243c683fc2891ed00b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08154e694a1619da171b31c9cf90fb316cbbc8821f1b39febd2fe413286aedb2aa02e42786e6ec04830fd0a77ce80f317a47b51dbbaed516c714d01fdbfc50a940da08d2a9f4020df8909ee5377aa470ad31a68259665bf392db364b3d31eb6ae7263b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083012e588203e880a005107a61eceb7b527d8a7f7a988ae32640666a05a10d8ce9fda6131f9333d6ba88d7ea57c218244572f862f860800183012e5894ba4f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca054aeb49b272934f1c9b09d36b6ad6cac4ee262c311c9a86d3f98db65bd00ee51a00178bd16091e19ed2e1c7d8160095d6bc9d6ef1d168ff61cb194dfc3b1d4d8c1c0",
+                "rlp" : "0xf90260f901f8a03797f4aae251d4ab33e6ba76ba49712643045f4a2f45a243c683fc2891ed00b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d3f78f18ea183fb8496ff2bafdf504098b92d9daa7add3c04e52c657ab616703a02e42786e6ec04830fd0a77ce80f317a47b51dbbaed516c714d01fdbfc50a940da041ca2a684b65e197e5164274ce8378f6886287548fd763dbd4d2131f421d9b06b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083012e588203e880a069060a8bc9f42bb5301506eebe7f5f69438a787b3230d221870a01aa8325a2a788119fdbd5e8a6e5f0f862f860800183012e5894ba4f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca054aeb49b272934f1c9b09d36b6ad6cac4ee262c311c9a86d3f98db65bd00ee51a00178bd16091e19ed2e1c7d8160095d6bc9d6ef1d168ff61cb194dfc3b1d4d8c1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5c2ca69baab334d19101761edc9ee07a518b9546f6cd713dacb2edabc8f913a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd9e952e9704e6797c94ca16df50d019dc0370b178ffa99e2e654129e293cc1b9",
-        "network" : "EIP150",
+        "lastblockhash" : "0x9721a384516a465152404d3188a791e5a0b1f49502cc32aabe7ded1e5937ae46",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "",
@@ -132,10 +139,150 @@
             }
         }
     },
-    "TouchToEmptyAccountRevert2_d0g0v0_EIP158" : {
+    "TouchToEmptyAccountRevert2_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/TouchToEmptyAccountRevert2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x012e58",
+                    "hash" : "0x835a4cc8d365b7d5b24305e8df00a16cc49778a9066c2c1c7fde1f39d24917cf",
+                    "mixHash" : "0x483808a57caba43c4be952487402312ee2a5b0e165a0759fbea91af7f6ac4627",
+                    "nonce" : "0x89e43b01bf51b483",
+                    "number" : "0x01",
+                    "parentHash" : "0x3797f4aae251d4ab33e6ba76ba49712643045f4a2f45a243c683fc2891ed00b0",
+                    "receiptTrie" : "0x41ca2a684b65e197e5164274ce8378f6886287548fd763dbd4d2131f421d9b06",
+                    "stateRoot" : "0xd3f78f18ea183fb8496ff2bafdf504098b92d9daa7add3c04e52c657ab616703",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x2e42786e6ec04830fd0a77ce80f317a47b51dbbaed516c714d01fdbfc50a940d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a03797f4aae251d4ab33e6ba76ba49712643045f4a2f45a243c683fc2891ed00b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d3f78f18ea183fb8496ff2bafdf504098b92d9daa7add3c04e52c657ab616703a02e42786e6ec04830fd0a77ce80f317a47b51dbbaed516c714d01fdbfc50a940da041ca2a684b65e197e5164274ce8378f6886287548fd763dbd4d2131f421d9b06b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083012e588203e880a0483808a57caba43c4be952487402312ee2a5b0e165a0759fbea91af7f6ac46278889e43b01bf51b483f862f860800183012e5894ba4f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca054aeb49b272934f1c9b09d36b6ad6cac4ee262c311c9a86d3f98db65bd00ee51a00178bd16091e19ed2e1c7d8160095d6bc9d6ef1d168ff61cb194dfc3b1d4d8c1c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x012e58",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x54aeb49b272934f1c9b09d36b6ad6cac4ee262c311c9a86d3f98db65bd00ee51",
+                        "s" : "0x0178bd16091e19ed2e1c7d8160095d6bc9d6ef1d168ff61cb194dfc3b1d4d8c1",
+                        "to" : "0xba4f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3797f4aae251d4ab33e6ba76ba49712643045f4a2f45a243c683fc2891ed00b0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7a5c2ca69baab334d19101761edc9ee07a518b9546f6cd713dacb2edabc8f913",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5c2ca69baab334d19101761edc9ee07a518b9546f6cd713dacb2edabc8f913a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x835a4cc8d365b7d5b24305e8df00a16cc49778a9066c2c1c7fde1f39d24917cf",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f52e58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3e1a8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x60006000600060006000731000000000000000000000000000000000000000617530f16002556001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xba4f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x60006000600060006000731000000000000000000000000000000000000000617530f16000556000600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x60006000600060006000731000000000000000000000000000000000000000617530f16002556001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xba4f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x60006000600060006000731000000000000000000000000000000000000000617530f16000556000600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "TouchToEmptyAccountRevert2_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/stRevertTest/TouchToEmptyAccountRevert2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -147,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x012e58",
-                    "hash" : "0x7bb245c8bdc123af7c5f2eb08749d08f2989fd3f1fbb6edd269c2d9fa3f213ba",
-                    "mixHash" : "0x3bbf51a8ba346fd3d0d245190293ac773307ba984d5bcc9f11cb457b34624738",
-                    "nonce" : "0x85dc969c2cf02c3d",
+                    "hash" : "0x51604dda6670280c4458a12ddf7166ce8c0dd802b10fefc216fd545ce3243aee",
+                    "mixHash" : "0x119b6cb81f090c288ece85c37212101d6aa3c686906fe20d615afd7c4f79e034",
+                    "nonce" : "0x4858ac32404ec8cd",
                     "number" : "0x01",
                     "parentHash" : "0x3797f4aae251d4ab33e6ba76ba49712643045f4a2f45a243c683fc2891ed00b0",
                     "receiptTrie" : "0x8d2a9f4020df8909ee5377aa470ad31a68259665bf392db364b3d31eb6ae7263",
@@ -158,7 +305,7 @@
                     "transactionsTrie" : "0x2e42786e6ec04830fd0a77ce80f317a47b51dbbaed516c714d01fdbfc50a940d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03797f4aae251d4ab33e6ba76ba49712643045f4a2f45a243c683fc2891ed00b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08154e694a1619da171b31c9cf90fb316cbbc8821f1b39febd2fe413286aedb2aa02e42786e6ec04830fd0a77ce80f317a47b51dbbaed516c714d01fdbfc50a940da08d2a9f4020df8909ee5377aa470ad31a68259665bf392db364b3d31eb6ae7263b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083012e588203e880a03bbf51a8ba346fd3d0d245190293ac773307ba984d5bcc9f11cb457b346247388885dc969c2cf02c3df862f860800183012e5894ba4f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca054aeb49b272934f1c9b09d36b6ad6cac4ee262c311c9a86d3f98db65bd00ee51a00178bd16091e19ed2e1c7d8160095d6bc9d6ef1d168ff61cb194dfc3b1d4d8c1c0",
+                "rlp" : "0xf90260f901f8a03797f4aae251d4ab33e6ba76ba49712643045f4a2f45a243c683fc2891ed00b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08154e694a1619da171b31c9cf90fb316cbbc8821f1b39febd2fe413286aedb2aa02e42786e6ec04830fd0a77ce80f317a47b51dbbaed516c714d01fdbfc50a940da08d2a9f4020df8909ee5377aa470ad31a68259665bf392db364b3d31eb6ae7263b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083012e588203e880a0119b6cb81f090c288ece85c37212101d6aa3c686906fe20d615afd7c4f79e034884858ac32404ec8cdf862f860800183012e5894ba4f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca054aeb49b272934f1c9b09d36b6ad6cac4ee262c311c9a86d3f98db65bd00ee51a00178bd16091e19ed2e1c7d8160095d6bc9d6ef1d168ff61cb194dfc3b1d4d8c1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -195,8 +342,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5c2ca69baab334d19101761edc9ee07a518b9546f6cd713dacb2edabc8f913a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7bb245c8bdc123af7c5f2eb08749d08f2989fd3f1fbb6edd269c2d9fa3f213ba",
-        "network" : "EIP158",
+        "lastblockhash" : "0x51604dda6670280c4458a12ddf7166ce8c0dd802b10fefc216fd545ce3243aee",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -265,10 +412,10 @@
             }
         }
     },
-    "TouchToEmptyAccountRevert2_d0g0v0_Frontier" : {
+    "TouchToEmptyAccountRevert2_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/stRevertTest/TouchToEmptyAccountRevert2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -279,19 +426,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x012960",
-                    "hash" : "0x4c56c3d8099fc174c12991d18d8b397f62215cb2e777eb8035a7fb00b548d090",
-                    "mixHash" : "0x1c66996f31f591cf6764b552f7ad987d656654a83b4aeb18d0b90ef24b00bf5c",
-                    "nonce" : "0x5bbed14522b65d8b",
+                    "gasUsed" : "0x012e58",
+                    "hash" : "0x50e6d148c579c6e8272b182a48de03cac1b2ed01f4867cafe734b42ab2f42b4b",
+                    "mixHash" : "0xcb5aac3f4c63ea7f49f4cd3bfdffc122aae5fe6c35eedd0b4a756a1fe277049c",
+                    "nonce" : "0xfc76fab00e56f7ce",
                     "number" : "0x01",
                     "parentHash" : "0x3797f4aae251d4ab33e6ba76ba49712643045f4a2f45a243c683fc2891ed00b0",
-                    "receiptTrie" : "0x9bb4c7ec36816a298957d664f34ecf0e59ece5cfc481197bdac733f4aca503fd",
-                    "stateRoot" : "0xeb7378441bb2ccb29da3ffc039a2a689f79cbd21cba0fe40287d26155f65e6a8",
+                    "receiptTrie" : "0x8d2a9f4020df8909ee5377aa470ad31a68259665bf392db364b3d31eb6ae7263",
+                    "stateRoot" : "0x8154e694a1619da171b31c9cf90fb316cbbc8821f1b39febd2fe413286aedb2a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2e42786e6ec04830fd0a77ce80f317a47b51dbbaed516c714d01fdbfc50a940d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03797f4aae251d4ab33e6ba76ba49712643045f4a2f45a243c683fc2891ed00b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb7378441bb2ccb29da3ffc039a2a689f79cbd21cba0fe40287d26155f65e6a8a02e42786e6ec04830fd0a77ce80f317a47b51dbbaed516c714d01fdbfc50a940da09bb4c7ec36816a298957d664f34ecf0e59ece5cfc481197bdac733f4aca503fdb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830129608203e880a01c66996f31f591cf6764b552f7ad987d656654a83b4aeb18d0b90ef24b00bf5c885bbed14522b65d8bf862f860800183012e5894ba4f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca054aeb49b272934f1c9b09d36b6ad6cac4ee262c311c9a86d3f98db65bd00ee51a00178bd16091e19ed2e1c7d8160095d6bc9d6ef1d168ff61cb194dfc3b1d4d8c1c0",
+                "rlp" : "0xf90260f901f8a03797f4aae251d4ab33e6ba76ba49712643045f4a2f45a243c683fc2891ed00b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08154e694a1619da171b31c9cf90fb316cbbc8821f1b39febd2fe413286aedb2aa02e42786e6ec04830fd0a77ce80f317a47b51dbbaed516c714d01fdbfc50a940da08d2a9f4020df8909ee5377aa470ad31a68259665bf392db364b3d31eb6ae7263b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083012e588203e880a0cb5aac3f4c63ea7f49f4cd3bfdffc122aae5fe6c35eedd0b4a756a1fe277049c88fc76fab00e56f7cef862f860800183012e5894ba4f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca054aeb49b272934f1c9b09d36b6ad6cac4ee262c311c9a86d3f98db65bd00ee51a00178bd16091e19ed2e1c7d8160095d6bc9d6ef1d168ff61cb194dfc3b1d4d8c1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -328,8 +475,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5c2ca69baab334d19101761edc9ee07a518b9546f6cd713dacb2edabc8f913a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4c56c3d8099fc174c12991d18d8b397f62215cb2e777eb8035a7fb00b548d090",
-        "network" : "Frontier",
+        "lastblockhash" : "0x50e6d148c579c6e8272b182a48de03cac1b2ed01f4867cafe734b42ab2f42b4b",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -339,14 +486,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52960",
+                "balance" : "0x4563918244f52e58",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3e6a0",
+                "balance" : "0xe8d4a3e1a8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -364,7 +511,6 @@
                 "code" : "0x60006000600060006000731000000000000000000000000000000000000000617530f16000556000600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1600155",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x01"
                 }
             }
         },
@@ -399,10 +545,10 @@
             }
         }
     },
-    "TouchToEmptyAccountRevert2_d0g0v0_Homestead" : {
+    "TouchToEmptyAccountRevert2_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/stRevertTest/TouchToEmptyAccountRevert2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -414,9 +560,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x012960",
-                    "hash" : "0x6e38d908b2430ad9a7e862d45544320ea6e3e9296c72d887494e5105b4aa4698",
-                    "mixHash" : "0x24cd41a0aab935bfe123b3a3585aab31d7393eb4599b485a484edfde78f33a89",
-                    "nonce" : "0x90df90b17bb1a46c",
+                    "hash" : "0x4b5eb00a8c28ac5449a3cc2b2a3377ffa8b98cc8f36d1cb4f00bf807dc77791c",
+                    "mixHash" : "0xf1bd10a7c13a615765d2d0e301389012c2412b833a61b3e205dd7d5318a1c84e",
+                    "nonce" : "0x0e9dab98056cd5bd",
                     "number" : "0x01",
                     "parentHash" : "0x3797f4aae251d4ab33e6ba76ba49712643045f4a2f45a243c683fc2891ed00b0",
                     "receiptTrie" : "0x9bb4c7ec36816a298957d664f34ecf0e59ece5cfc481197bdac733f4aca503fd",
@@ -425,7 +571,7 @@
                     "transactionsTrie" : "0x2e42786e6ec04830fd0a77ce80f317a47b51dbbaed516c714d01fdbfc50a940d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03797f4aae251d4ab33e6ba76ba49712643045f4a2f45a243c683fc2891ed00b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb7378441bb2ccb29da3ffc039a2a689f79cbd21cba0fe40287d26155f65e6a8a02e42786e6ec04830fd0a77ce80f317a47b51dbbaed516c714d01fdbfc50a940da09bb4c7ec36816a298957d664f34ecf0e59ece5cfc481197bdac733f4aca503fdb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830129608203e880a024cd41a0aab935bfe123b3a3585aab31d7393eb4599b485a484edfde78f33a898890df90b17bb1a46cf862f860800183012e5894ba4f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca054aeb49b272934f1c9b09d36b6ad6cac4ee262c311c9a86d3f98db65bd00ee51a00178bd16091e19ed2e1c7d8160095d6bc9d6ef1d168ff61cb194dfc3b1d4d8c1c0",
+                "rlp" : "0xf90260f901f8a03797f4aae251d4ab33e6ba76ba49712643045f4a2f45a243c683fc2891ed00b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb7378441bb2ccb29da3ffc039a2a689f79cbd21cba0fe40287d26155f65e6a8a02e42786e6ec04830fd0a77ce80f317a47b51dbbaed516c714d01fdbfc50a940da09bb4c7ec36816a298957d664f34ecf0e59ece5cfc481197bdac733f4aca503fdb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830129608203e880a0f1bd10a7c13a615765d2d0e301389012c2412b833a61b3e205dd7d5318a1c84e880e9dab98056cd5bdf862f860800183012e5894ba4f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca054aeb49b272934f1c9b09d36b6ad6cac4ee262c311c9a86d3f98db65bd00ee51a00178bd16091e19ed2e1c7d8160095d6bc9d6ef1d168ff61cb194dfc3b1d4d8c1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -462,8 +608,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5c2ca69baab334d19101761edc9ee07a518b9546f6cd713dacb2edabc8f913a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6e38d908b2430ad9a7e862d45544320ea6e3e9296c72d887494e5105b4aa4698",
-        "network" : "Homestead",
+        "lastblockhash" : "0x4b5eb00a8c28ac5449a3cc2b2a3377ffa8b98cc8f36d1cb4f00bf807dc77791c",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -533,10 +679,10 @@
             }
         }
     },
-    "TouchToEmptyAccountRevert2_d0g0v0_Metropolis" : {
+    "TouchToEmptyAccountRevert2_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/TouchToEmptyAccountRevert2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -547,19 +693,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x012e58",
-                    "hash" : "0xa28db90effe4c83b9fb6c277fd8f1ddf1b43f7201c110e224d2494bf540c6da8",
-                    "mixHash" : "0xadaa1940ea6c89d1f03c7d7ce04a152f0edb35a826f085ef6897e840d02e3854",
-                    "nonce" : "0x885a65d080a3301c",
+                    "gasUsed" : "0x012960",
+                    "hash" : "0x4701c8489f95a7751a99355029355b6390c4c37ea8ba3c7173155532698588fd",
+                    "mixHash" : "0x9b8956eeb0ff8bb1be1283432d8b7211ad23432d900eae58cada548bedbea437",
+                    "nonce" : "0x08293a6775714799",
                     "number" : "0x01",
                     "parentHash" : "0x3797f4aae251d4ab33e6ba76ba49712643045f4a2f45a243c683fc2891ed00b0",
-                    "receiptTrie" : "0x41ca2a684b65e197e5164274ce8378f6886287548fd763dbd4d2131f421d9b06",
-                    "stateRoot" : "0xd3f78f18ea183fb8496ff2bafdf504098b92d9daa7add3c04e52c657ab616703",
+                    "receiptTrie" : "0x9bb4c7ec36816a298957d664f34ecf0e59ece5cfc481197bdac733f4aca503fd",
+                    "stateRoot" : "0xeb7378441bb2ccb29da3ffc039a2a689f79cbd21cba0fe40287d26155f65e6a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2e42786e6ec04830fd0a77ce80f317a47b51dbbaed516c714d01fdbfc50a940d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03797f4aae251d4ab33e6ba76ba49712643045f4a2f45a243c683fc2891ed00b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d3f78f18ea183fb8496ff2bafdf504098b92d9daa7add3c04e52c657ab616703a02e42786e6ec04830fd0a77ce80f317a47b51dbbaed516c714d01fdbfc50a940da041ca2a684b65e197e5164274ce8378f6886287548fd763dbd4d2131f421d9b06b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083012e588203e880a0adaa1940ea6c89d1f03c7d7ce04a152f0edb35a826f085ef6897e840d02e385488885a65d080a3301cf862f860800183012e5894ba4f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca054aeb49b272934f1c9b09d36b6ad6cac4ee262c311c9a86d3f98db65bd00ee51a00178bd16091e19ed2e1c7d8160095d6bc9d6ef1d168ff61cb194dfc3b1d4d8c1c0",
+                "rlp" : "0xf90260f901f8a03797f4aae251d4ab33e6ba76ba49712643045f4a2f45a243c683fc2891ed00b0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb7378441bb2ccb29da3ffc039a2a689f79cbd21cba0fe40287d26155f65e6a8a02e42786e6ec04830fd0a77ce80f317a47b51dbbaed516c714d01fdbfc50a940da09bb4c7ec36816a298957d664f34ecf0e59ece5cfc481197bdac733f4aca503fdb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830129608203e880a09b8956eeb0ff8bb1be1283432d8b7211ad23432d900eae58cada548bedbea4378808293a6775714799f862f860800183012e5894ba4f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca054aeb49b272934f1c9b09d36b6ad6cac4ee262c311c9a86d3f98db65bd00ee51a00178bd16091e19ed2e1c7d8160095d6bc9d6ef1d168ff61cb194dfc3b1d4d8c1c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -596,16 +742,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5c2ca69baab334d19101761edc9ee07a518b9546f6cd713dacb2edabc8f913a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa28db90effe4c83b9fb6c277fd8f1ddf1b43f7201c110e224d2494bf540c6da8",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4701c8489f95a7751a99355029355b6390c4c37ea8ba3c7173155532698588fd",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "",
@@ -614,14 +753,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52e58",
+                "balance" : "0x4563918244f52960",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3e1a8",
+                "balance" : "0xe8d4a3e6a0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -639,6 +778,7 @@
                 "code" : "0x60006000600060006000731000000000000000000000000000000000000000617530f16000556000600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1600155",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert3_d0g0v0.json
index f13d69bf5..2587d387e 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert3_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "TouchToEmptyAccountRevert3_d0g0v0_EIP150" : {
+    "TouchToEmptyAccountRevert3_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/stRevertTest/TouchToEmptyAccountRevert3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0141e0",
-                    "hash" : "0xd094b229e27c685be84101769287f88c55a6b86e94afc5ff084ed288656b201b",
-                    "mixHash" : "0x35b4bad58ceee0af750b6bd03c2fd2d87907367132d588c492bfee6db573a850",
-                    "nonce" : "0x7996881d749052c7",
+                    "hash" : "0x30db4ee38dc2ede09a03d2bd234499e27959e5d64cf4a4c4f0c5493789c62d01",
+                    "mixHash" : "0x13098b02e13fee59a7c4dc143d9d38ef1f0cf4674f349053a1de224b194c558d",
+                    "nonce" : "0xa661f5fa45b2adb8",
                     "number" : "0x01",
                     "parentHash" : "0x6f03dfb2e474c0e66062f605bb63c4f191b1b25f1ab5bb658502654f92940366",
-                    "receiptTrie" : "0x7e1de02f950f051a6a39277233ea54254f21e40253257292410dca726a2df69d",
-                    "stateRoot" : "0x948a57e0dab6ab9f9ada8cd84134391a8aa807d251fe19df4f2c1baf00fd725f",
+                    "receiptTrie" : "0xb8abaa715d17fcfc4bc0395b274f6a93bf5243cd138598bbee2c97e1638da8c2",
+                    "stateRoot" : "0x0a727da7740d6352a8613e95f1e98ff1837b751afe53b6b3f49478a0df65a03b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x903cb032d1e65affdad8f04c3a8866fb89f616051a1b8c394b306724fcfabea5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06f03dfb2e474c0e66062f605bb63c4f191b1b25f1ab5bb658502654f92940366a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0948a57e0dab6ab9f9ada8cd84134391a8aa807d251fe19df4f2c1baf00fd725fa0903cb032d1e65affdad8f04c3a8866fb89f616051a1b8c394b306724fcfabea5a07e1de02f950f051a6a39277233ea54254f21e40253257292410dca726a2df69db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830141e08203e880a035b4bad58ceee0af750b6bd03c2fd2d87907367132d588c492bfee6db573a850887996881d749052c7f862f8608001830141e094ba4f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0c54136371ca85a765ad177ab231137bd0c60e44363ed248490e9afefa43a4b4fa0226274aba5489e3f59adade154f1372e48e9da8fd245ffb7634f9262aa77f560c0",
+                "rlp" : "0xf90260f901f8a06f03dfb2e474c0e66062f605bb63c4f191b1b25f1ab5bb658502654f92940366a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00a727da7740d6352a8613e95f1e98ff1837b751afe53b6b3f49478a0df65a03ba0903cb032d1e65affdad8f04c3a8866fb89f616051a1b8c394b306724fcfabea5a0b8abaa715d17fcfc4bc0395b274f6a93bf5243cd138598bbee2c97e1638da8c2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830141e08203e880a013098b02e13fee59a7c4dc143d9d38ef1f0cf4674f349053a1de224b194c558d88a661f5fa45b2adb8f862f8608001830141e094ba4f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0c54136371ca85a765ad177ab231137bd0c60e44363ed248490e9afefa43a4b4fa0226274aba5489e3f59adade154f1372e48e9da8fd245ffb7634f9262aa77f560c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d41eafcc754f9e8563a2540777d9e1c5ac62660406ce7a4412b74751f1ae104ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd094b229e27c685be84101769287f88c55a6b86e94afc5ff084ed288656b201b",
-        "network" : "EIP150",
+        "lastblockhash" : "0x30db4ee38dc2ede09a03d2bd234499e27959e5d64cf4a4c4f0c5493789c62d01",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "",
@@ -160,10 +167,10 @@
             }
         }
     },
-    "TouchToEmptyAccountRevert3_d0g0v0_EIP158" : {
+    "TouchToEmptyAccountRevert3_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/stRevertTest/TouchToEmptyAccountRevert3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -175,18 +182,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0141e0",
-                    "hash" : "0x166401d828d422932ca4831a715dab4ca9b635f48d66e742232850fe5fc9be27",
-                    "mixHash" : "0xbae5a3cc678eae1637e29193ef1cf79e90e2a8cae570d828ded26ad56b3a2f5b",
-                    "nonce" : "0x4e04c47d95851327",
+                    "hash" : "0x9a9ee528956cfca0dbbe2add84f16ce97be8fd7e44f5ebe7180ad77bf4ae6125",
+                    "mixHash" : "0xf07e72f99eb5073dfd88fa4faecb3dc003331e9868fee6f87f5f9391ab074ede",
+                    "nonce" : "0xbffddc1b66bf93dd",
                     "number" : "0x01",
                     "parentHash" : "0x6f03dfb2e474c0e66062f605bb63c4f191b1b25f1ab5bb658502654f92940366",
-                    "receiptTrie" : "0x7e1de02f950f051a6a39277233ea54254f21e40253257292410dca726a2df69d",
-                    "stateRoot" : "0x948a57e0dab6ab9f9ada8cd84134391a8aa807d251fe19df4f2c1baf00fd725f",
+                    "receiptTrie" : "0xb8abaa715d17fcfc4bc0395b274f6a93bf5243cd138598bbee2c97e1638da8c2",
+                    "stateRoot" : "0x0a727da7740d6352a8613e95f1e98ff1837b751afe53b6b3f49478a0df65a03b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x903cb032d1e65affdad8f04c3a8866fb89f616051a1b8c394b306724fcfabea5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06f03dfb2e474c0e66062f605bb63c4f191b1b25f1ab5bb658502654f92940366a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0948a57e0dab6ab9f9ada8cd84134391a8aa807d251fe19df4f2c1baf00fd725fa0903cb032d1e65affdad8f04c3a8866fb89f616051a1b8c394b306724fcfabea5a07e1de02f950f051a6a39277233ea54254f21e40253257292410dca726a2df69db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830141e08203e880a0bae5a3cc678eae1637e29193ef1cf79e90e2a8cae570d828ded26ad56b3a2f5b884e04c47d95851327f862f8608001830141e094ba4f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0c54136371ca85a765ad177ab231137bd0c60e44363ed248490e9afefa43a4b4fa0226274aba5489e3f59adade154f1372e48e9da8fd245ffb7634f9262aa77f560c0",
+                "rlp" : "0xf90260f901f8a06f03dfb2e474c0e66062f605bb63c4f191b1b25f1ab5bb658502654f92940366a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00a727da7740d6352a8613e95f1e98ff1837b751afe53b6b3f49478a0df65a03ba0903cb032d1e65affdad8f04c3a8866fb89f616051a1b8c394b306724fcfabea5a0b8abaa715d17fcfc4bc0395b274f6a93bf5243cd138598bbee2c97e1638da8c2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830141e08203e880a0f07e72f99eb5073dfd88fa4faecb3dc003331e9868fee6f87f5f9391ab074ede88bffddc1b66bf93ddf862f8608001830141e094ba4f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0c54136371ca85a765ad177ab231137bd0c60e44363ed248490e9afefa43a4b4fa0226274aba5489e3f59adade154f1372e48e9da8fd245ffb7634f9262aa77f560c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -223,9 +230,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d41eafcc754f9e8563a2540777d9e1c5ac62660406ce7a4412b74751f1ae104ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x166401d828d422932ca4831a715dab4ca9b635f48d66e742232850fe5fc9be27",
-        "network" : "EIP158",
+        "lastblockhash" : "0x9a9ee528956cfca0dbbe2add84f16ce97be8fd7e44f5ebe7180ad77bf4ae6125",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "",
@@ -321,10 +335,10 @@
             }
         }
     },
-    "TouchToEmptyAccountRevert3_d0g0v0_Frontier" : {
+    "TouchToEmptyAccountRevert3_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/stRevertTest/TouchToEmptyAccountRevert3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,19 +349,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xcba3",
-                    "hash" : "0x87ee3485d07e911a30b07f28bc60aeb0f70ff70bf015bfb8f6463fb99305f6de",
-                    "mixHash" : "0x1820b20512c615622115f051e8bcb58bd8396b69671ae329115e7a3c171700ab",
-                    "nonce" : "0xfe7d6067cdbc7957",
+                    "gasUsed" : "0x0141e0",
+                    "hash" : "0x052cc955dd91f4defeeb90fed66ecf5a85d6f138687e4b70a4b55762eeb801cd",
+                    "mixHash" : "0x4540dabbc5e523fb8e6a7ac335dbe7950ef7b6f6c598232b2235cbf67fb4d704",
+                    "nonce" : "0xff051bd44203b268",
                     "number" : "0x01",
                     "parentHash" : "0x6f03dfb2e474c0e66062f605bb63c4f191b1b25f1ab5bb658502654f92940366",
-                    "receiptTrie" : "0xbb668985ffa76095a763882315f0c29ad90e28243ad8ab5227644664b1947beb",
-                    "stateRoot" : "0xaf352ee7981c3f4af11ea7b5a8cbae8e9f617102a4e3a9d66d173e18b499692a",
+                    "receiptTrie" : "0x7e1de02f950f051a6a39277233ea54254f21e40253257292410dca726a2df69d",
+                    "stateRoot" : "0x948a57e0dab6ab9f9ada8cd84134391a8aa807d251fe19df4f2c1baf00fd725f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x903cb032d1e65affdad8f04c3a8866fb89f616051a1b8c394b306724fcfabea5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a06f03dfb2e474c0e66062f605bb63c4f191b1b25f1ab5bb658502654f92940366a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0af352ee7981c3f4af11ea7b5a8cbae8e9f617102a4e3a9d66d173e18b499692aa0903cb032d1e65affdad8f04c3a8866fb89f616051a1b8c394b306724fcfabea5a0bb668985ffa76095a763882315f0c29ad90e28243ad8ab5227644664b1947bebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082cba38203e880a01820b20512c615622115f051e8bcb58bd8396b69671ae329115e7a3c171700ab88fe7d6067cdbc7957f862f8608001830141e094ba4f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0c54136371ca85a765ad177ab231137bd0c60e44363ed248490e9afefa43a4b4fa0226274aba5489e3f59adade154f1372e48e9da8fd245ffb7634f9262aa77f560c0",
+                "rlp" : "0xf90260f901f8a06f03dfb2e474c0e66062f605bb63c4f191b1b25f1ab5bb658502654f92940366a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0948a57e0dab6ab9f9ada8cd84134391a8aa807d251fe19df4f2c1baf00fd725fa0903cb032d1e65affdad8f04c3a8866fb89f616051a1b8c394b306724fcfabea5a07e1de02f950f051a6a39277233ea54254f21e40253257292410dca726a2df69db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830141e08203e880a04540dabbc5e523fb8e6a7ac335dbe7950ef7b6f6c598232b2235cbf67fb4d70488ff051bd44203b268f862f8608001830141e094ba4f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0c54136371ca85a765ad177ab231137bd0c60e44363ed248490e9afefa43a4b4fa0226274aba5489e3f59adade154f1372e48e9da8fd245ffb7634f9262aa77f560c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -384,8 +398,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d41eafcc754f9e8563a2540777d9e1c5ac62660406ce7a4412b74751f1ae104ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x87ee3485d07e911a30b07f28bc60aeb0f70ff70bf015bfb8f6463fb99305f6de",
-        "network" : "Frontier",
+        "lastblockhash" : "0x052cc955dd91f4defeeb90fed66ecf5a85d6f138687e4b70a4b55762eeb801cd",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -395,14 +409,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4cba3",
+                "balance" : "0x4563918244f541e0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a4445d",
+                "balance" : "0xe8d4a3ce20",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -420,7 +434,13 @@
                 "code" : "0x6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f16000556000600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1600155",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x01"
+                }
+            },
+            "0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
                 }
             },
             "0xe94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -476,10 +496,10 @@
             }
         }
     },
-    "TouchToEmptyAccountRevert3_d0g0v0_Homestead" : {
+    "TouchToEmptyAccountRevert3_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/stRevertTest/TouchToEmptyAccountRevert3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -490,19 +510,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xcba3",
-                    "hash" : "0x44143490a489d8fdc7445fbb1c048a5822e06898e97d6961d557bcf995d3a800",
-                    "mixHash" : "0xb2641764cd287552a06304d38368dd6f5ecfbda56d0b5fd79c8891b32fb1e836",
-                    "nonce" : "0xd78ab60ae853da1e",
+                    "gasUsed" : "0x0141e0",
+                    "hash" : "0x60cb7ebf44376579822e27555ac666f201b811cacdec3eae63319dc5b23442f9",
+                    "mixHash" : "0x786605250a0c49ea20489a20d1a2840262ccef6b3666a545e834af4eccbad1e4",
+                    "nonce" : "0xe72679768b67d742",
                     "number" : "0x01",
                     "parentHash" : "0x6f03dfb2e474c0e66062f605bb63c4f191b1b25f1ab5bb658502654f92940366",
-                    "receiptTrie" : "0xbb668985ffa76095a763882315f0c29ad90e28243ad8ab5227644664b1947beb",
-                    "stateRoot" : "0xaf352ee7981c3f4af11ea7b5a8cbae8e9f617102a4e3a9d66d173e18b499692a",
+                    "receiptTrie" : "0x7e1de02f950f051a6a39277233ea54254f21e40253257292410dca726a2df69d",
+                    "stateRoot" : "0x948a57e0dab6ab9f9ada8cd84134391a8aa807d251fe19df4f2c1baf00fd725f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x903cb032d1e65affdad8f04c3a8866fb89f616051a1b8c394b306724fcfabea5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a06f03dfb2e474c0e66062f605bb63c4f191b1b25f1ab5bb658502654f92940366a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0af352ee7981c3f4af11ea7b5a8cbae8e9f617102a4e3a9d66d173e18b499692aa0903cb032d1e65affdad8f04c3a8866fb89f616051a1b8c394b306724fcfabea5a0bb668985ffa76095a763882315f0c29ad90e28243ad8ab5227644664b1947bebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082cba38203e880a0b2641764cd287552a06304d38368dd6f5ecfbda56d0b5fd79c8891b32fb1e83688d78ab60ae853da1ef862f8608001830141e094ba4f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0c54136371ca85a765ad177ab231137bd0c60e44363ed248490e9afefa43a4b4fa0226274aba5489e3f59adade154f1372e48e9da8fd245ffb7634f9262aa77f560c0",
+                "rlp" : "0xf90260f901f8a06f03dfb2e474c0e66062f605bb63c4f191b1b25f1ab5bb658502654f92940366a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0948a57e0dab6ab9f9ada8cd84134391a8aa807d251fe19df4f2c1baf00fd725fa0903cb032d1e65affdad8f04c3a8866fb89f616051a1b8c394b306724fcfabea5a07e1de02f950f051a6a39277233ea54254f21e40253257292410dca726a2df69db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830141e08203e880a0786605250a0c49ea20489a20d1a2840262ccef6b3666a545e834af4eccbad1e488e72679768b67d742f862f8608001830141e094ba4f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0c54136371ca85a765ad177ab231137bd0c60e44363ed248490e9afefa43a4b4fa0226274aba5489e3f59adade154f1372e48e9da8fd245ffb7634f9262aa77f560c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -539,8 +559,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d41eafcc754f9e8563a2540777d9e1c5ac62660406ce7a4412b74751f1ae104ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x44143490a489d8fdc7445fbb1c048a5822e06898e97d6961d557bcf995d3a800",
-        "network" : "Homestead",
+        "lastblockhash" : "0x60cb7ebf44376579822e27555ac666f201b811cacdec3eae63319dc5b23442f9",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -550,14 +570,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4cba3",
+                "balance" : "0x4563918244f541e0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a4445d",
+                "balance" : "0xe8d4a3ce20",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -575,7 +595,13 @@
                 "code" : "0x6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f16000556000600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1600155",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x01"
+                }
+            },
+            "0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
                 }
             },
             "0xe94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -631,10 +657,10 @@
             }
         }
     },
-    "TouchToEmptyAccountRevert3_d0g0v0_Metropolis" : {
+    "TouchToEmptyAccountRevert3_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/stRevertTest/TouchToEmptyAccountRevert3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -645,19 +671,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0141e0",
-                    "hash" : "0xd892b9c5df9ddd81c6d3546025053a57ef0c6345db6bad1b9fc6195a94e16acc",
-                    "mixHash" : "0x99bf23c32c107f5a951f3e3668d9f2229eb5a5c13c7d68ecd196f5990ce2022b",
-                    "nonce" : "0x2e66be5519c1d916",
+                    "gasUsed" : "0xcba3",
+                    "hash" : "0x8e0da583da32555763b810a8bf8d09e96b8a7002d5d5b6cef0233c1d328c78ad",
+                    "mixHash" : "0x542bcbafe8dedafd762c6740aacbe7e05dd204c742a6159e441bb2662cf28861",
+                    "nonce" : "0x0aab858b3bd02929",
                     "number" : "0x01",
                     "parentHash" : "0x6f03dfb2e474c0e66062f605bb63c4f191b1b25f1ab5bb658502654f92940366",
-                    "receiptTrie" : "0xb8abaa715d17fcfc4bc0395b274f6a93bf5243cd138598bbee2c97e1638da8c2",
-                    "stateRoot" : "0x0a727da7740d6352a8613e95f1e98ff1837b751afe53b6b3f49478a0df65a03b",
+                    "receiptTrie" : "0xbb668985ffa76095a763882315f0c29ad90e28243ad8ab5227644664b1947beb",
+                    "stateRoot" : "0xaf352ee7981c3f4af11ea7b5a8cbae8e9f617102a4e3a9d66d173e18b499692a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x903cb032d1e65affdad8f04c3a8866fb89f616051a1b8c394b306724fcfabea5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a06f03dfb2e474c0e66062f605bb63c4f191b1b25f1ab5bb658502654f92940366a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00a727da7740d6352a8613e95f1e98ff1837b751afe53b6b3f49478a0df65a03ba0903cb032d1e65affdad8f04c3a8866fb89f616051a1b8c394b306724fcfabea5a0b8abaa715d17fcfc4bc0395b274f6a93bf5243cd138598bbee2c97e1638da8c2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830141e08203e880a099bf23c32c107f5a951f3e3668d9f2229eb5a5c13c7d68ecd196f5990ce2022b882e66be5519c1d916f862f8608001830141e094ba4f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0c54136371ca85a765ad177ab231137bd0c60e44363ed248490e9afefa43a4b4fa0226274aba5489e3f59adade154f1372e48e9da8fd245ffb7634f9262aa77f560c0",
+                "rlp" : "0xf9025ff901f7a06f03dfb2e474c0e66062f605bb63c4f191b1b25f1ab5bb658502654f92940366a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0af352ee7981c3f4af11ea7b5a8cbae8e9f617102a4e3a9d66d173e18b499692aa0903cb032d1e65affdad8f04c3a8866fb89f616051a1b8c394b306724fcfabea5a0bb668985ffa76095a763882315f0c29ad90e28243ad8ab5227644664b1947bebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082cba38203e880a0542bcbafe8dedafd762c6740aacbe7e05dd204c742a6159e441bb2662cf28861880aab858b3bd02929f862f8608001830141e094ba4f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0c54136371ca85a765ad177ab231137bd0c60e44363ed248490e9afefa43a4b4fa0226274aba5489e3f59adade154f1372e48e9da8fd245ffb7634f9262aa77f560c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -694,34 +720,65 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d41eafcc754f9e8563a2540777d9e1c5ac62660406ce7a4412b74751f1ae104ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd892b9c5df9ddd81c6d3546025053a57ef0c6345db6bad1b9fc6195a94e16acc",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x8e0da583da32555763b810a8bf8d09e96b8a7002d5d5b6cef0233c1d328c78ad",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4cba3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f541e0",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a4445d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073e94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f16002556001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xba4f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f16000556000600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xe94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3ce20",
+                "balance" : "0xe8d4a51000",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
@@ -753,6 +810,117 @@
                 "storage" : {
                 }
             }
+        }
+    },
+    "TouchToEmptyAccountRevert3_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/TouchToEmptyAccountRevert3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xcba3",
+                    "hash" : "0xc761b8432cd017046050b26162d9006f1c3afd10a1cab4ab8d8abca305f8c5a9",
+                    "mixHash" : "0x1a4551c67ed7bdf40465a81f70d8c928e8bce799daf20a484c19f3deebb2074e",
+                    "nonce" : "0x0cb467f53ce51bcb",
+                    "number" : "0x01",
+                    "parentHash" : "0x6f03dfb2e474c0e66062f605bb63c4f191b1b25f1ab5bb658502654f92940366",
+                    "receiptTrie" : "0xbb668985ffa76095a763882315f0c29ad90e28243ad8ab5227644664b1947beb",
+                    "stateRoot" : "0xaf352ee7981c3f4af11ea7b5a8cbae8e9f617102a4e3a9d66d173e18b499692a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x903cb032d1e65affdad8f04c3a8866fb89f616051a1b8c394b306724fcfabea5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a06f03dfb2e474c0e66062f605bb63c4f191b1b25f1ab5bb658502654f92940366a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0af352ee7981c3f4af11ea7b5a8cbae8e9f617102a4e3a9d66d173e18b499692aa0903cb032d1e65affdad8f04c3a8866fb89f616051a1b8c394b306724fcfabea5a0bb668985ffa76095a763882315f0c29ad90e28243ad8ab5227644664b1947bebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082cba38203e880a01a4551c67ed7bdf40465a81f70d8c928e8bce799daf20a484c19f3deebb2074e880cb467f53ce51bcbf862f8608001830141e094ba4f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0c54136371ca85a765ad177ab231137bd0c60e44363ed248490e9afefa43a4b4fa0226274aba5489e3f59adade154f1372e48e9da8fd245ffb7634f9262aa77f560c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0141e0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc54136371ca85a765ad177ab231137bd0c60e44363ed248490e9afefa43a4b4f",
+                        "s" : "0x226274aba5489e3f59adade154f1372e48e9da8fd245ffb7634f9262aa77f560",
+                        "to" : "0xba4f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x6f03dfb2e474c0e66062f605bb63c4f191b1b25f1ab5bb658502654f92940366",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd41eafcc754f9e8563a2540777d9e1c5ac62660406ce7a4412b74751f1ae104e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d41eafcc754f9e8563a2540777d9e1c5ac62660406ce7a4412b74751f1ae104ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc761b8432cd017046050b26162d9006f1c3afd10a1cab4ab8d8abca305f8c5a9",
+        "network" : "Homestead",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4cba3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a4445d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073e94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f16002556001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xba4f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f16000556000600060006000600073b94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xe94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
         },
         "pre" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert_d0g0v0.json
index 4e838006c..6fa5c0f6f 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "TouchToEmptyAccountRevert_d0g0v0_EIP150" : {
+    "TouchToEmptyAccountRevert_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/stRevertTest/TouchToEmptyAccountRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0x8bfd7098877d3656c28a0c729f11a784c1905a8f55aac45653f326ae27b2168c",
-                    "mixHash" : "0xf31fd0a41a4632ec1f5641f6c717d9273001dd136698d60ba77e84657ad4d6b7",
-                    "nonce" : "0x1193a9b58290015f",
+                    "hash" : "0xd83e3a9e1e696c34d008b725bc2b628e43134f5c387dfe843114fb2fbf111f6a",
+                    "mixHash" : "0xf4bb936b6e0627a4b35a58c6f2ebbda59a3fb7f213facfb5bd00c1ca4003f461",
+                    "nonce" : "0x5cfc456c23858adc",
                     "number" : "0x01",
                     "parentHash" : "0x315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416",
-                    "receiptTrie" : "0x3f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56a",
-                    "stateRoot" : "0xf84fb9fd05a6169e6e31f15f527fce50b1b92cb905d38b614cf99afa1c1df23b",
+                    "receiptTrie" : "0x33206fdb0b04af73aed5fcc49c377894a2ad7acc74a06782884999e9c75de4ba",
+                    "stateRoot" : "0xf6293e80736531f83021d7d88e5d206df6083c003e90b0e3e8731037ad31416e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f84fb9fd05a6169e6e31f15f527fce50b1b92cb905d38b614cf99afa1c1df23ba0d807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867a03f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0f31fd0a41a4632ec1f5641f6c717d9273001dd136698d60ba77e84657ad4d6b7881193a9b58290015ff862f86080018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba02263a45338e3fd8975ecb00bb2be4f23ab279a8c7565d97c2b33420b3003d97ea059d5152e2d60f87cbb7a9d8c790730849553b2181514a6cd58564a29aeefad0ec0",
+                "rlp" : "0xf90260f901f8a0315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f6293e80736531f83021d7d88e5d206df6083c003e90b0e3e8731037ad31416ea0d807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867a033206fdb0b04af73aed5fcc49c377894a2ad7acc74a06782884999e9c75de4bab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0f4bb936b6e0627a4b35a58c6f2ebbda59a3fb7f213facfb5bd00c1ca4003f461885cfc456c23858adcf862f86080018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba02263a45338e3fd8975ecb00bb2be4f23ab279a8c7565d97c2b33420b3003d97ea059d5152e2d60f87cbb7a9d8c790730849553b2181514a6cd58564a29aeefad0ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbc6ae9218631af51abf428b88d44c9b4b97c81d3fea9d88203cd307f05cce58a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8bfd7098877d3656c28a0c729f11a784c1905a8f55aac45653f326ae27b2168c",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd83e3a9e1e696c34d008b725bc2b628e43134f5c387dfe843114fb2fbf111f6a",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "",
@@ -132,10 +139,10 @@
             }
         }
     },
-    "TouchToEmptyAccountRevert_d0g0v0_EIP158" : {
+    "TouchToEmptyAccountRevert_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/stRevertTest/TouchToEmptyAccountRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -147,18 +154,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0x120e5f2803f044d7fb628349c0e881d7c3fef966f1893de96b72aebe4ffd9589",
-                    "mixHash" : "0x5314dbcd2a888ea3ae239b27a880786f14d7b24b2465f647198ddf8325a62681",
-                    "nonce" : "0xb3148fc2ac81d6f7",
+                    "hash" : "0x8fe826ed4d2998fad85e56767460986a4a7f298a5850e387c1a75326a00c1c85",
+                    "mixHash" : "0xbaae025708094651afae4977220f92f5d01eadb0a2fce7b7c58e694a60cb4579",
+                    "nonce" : "0xdcb0059d434d8390",
                     "number" : "0x01",
                     "parentHash" : "0x315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416",
-                    "receiptTrie" : "0x3f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56a",
-                    "stateRoot" : "0xf84fb9fd05a6169e6e31f15f527fce50b1b92cb905d38b614cf99afa1c1df23b",
+                    "receiptTrie" : "0x33206fdb0b04af73aed5fcc49c377894a2ad7acc74a06782884999e9c75de4ba",
+                    "stateRoot" : "0xf6293e80736531f83021d7d88e5d206df6083c003e90b0e3e8731037ad31416e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f84fb9fd05a6169e6e31f15f527fce50b1b92cb905d38b614cf99afa1c1df23ba0d807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867a03f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a05314dbcd2a888ea3ae239b27a880786f14d7b24b2465f647198ddf8325a6268188b3148fc2ac81d6f7f862f86080018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba02263a45338e3fd8975ecb00bb2be4f23ab279a8c7565d97c2b33420b3003d97ea059d5152e2d60f87cbb7a9d8c790730849553b2181514a6cd58564a29aeefad0ec0",
+                "rlp" : "0xf90260f901f8a0315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f6293e80736531f83021d7d88e5d206df6083c003e90b0e3e8731037ad31416ea0d807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867a033206fdb0b04af73aed5fcc49c377894a2ad7acc74a06782884999e9c75de4bab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0baae025708094651afae4977220f92f5d01eadb0a2fce7b7c58e694a60cb457988dcb0059d434d8390f862f86080018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba02263a45338e3fd8975ecb00bb2be4f23ab279a8c7565d97c2b33420b3003d97ea059d5152e2d60f87cbb7a9d8c790730849553b2181514a6cd58564a29aeefad0ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -195,9 +202,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbc6ae9218631af51abf428b88d44c9b4b97c81d3fea9d88203cd307f05cce58a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x120e5f2803f044d7fb628349c0e881d7c3fef966f1893de96b72aebe4ffd9589",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8fe826ed4d2998fad85e56767460986a4a7f298a5850e387c1a75326a00c1c85",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "",
@@ -265,10 +279,10 @@
             }
         }
     },
-    "TouchToEmptyAccountRevert_d0g0v0_Frontier" : {
+    "TouchToEmptyAccountRevert_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/stRevertTest/TouchToEmptyAccountRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -280,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0x6e4d70b07abef152584128b8790ef2389f190ea45b68a6a5e07b8310c25a527e",
-                    "mixHash" : "0x5c69eab1011ff94553e43bff7a95d0787a128edd04ec3e78d4eedcea578c29d9",
-                    "nonce" : "0x5f56da8bc4b92abb",
+                    "hash" : "0xdf421ddc7a183d8a484bd382c812243f3ae95f066ecc331d07367551d732649b",
+                    "mixHash" : "0xa00b027e66fc5e69819f9c080e9df89914d7d159ace646928599c3e8f8eee6c4",
+                    "nonce" : "0xfb9463e317433049",
                     "number" : "0x01",
                     "parentHash" : "0x315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416",
                     "receiptTrie" : "0x3f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56a",
@@ -291,7 +305,7 @@
                     "transactionsTrie" : "0xd807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f84fb9fd05a6169e6e31f15f527fce50b1b92cb905d38b614cf99afa1c1df23ba0d807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867a03f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a05c69eab1011ff94553e43bff7a95d0787a128edd04ec3e78d4eedcea578c29d9885f56da8bc4b92abbf862f86080018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba02263a45338e3fd8975ecb00bb2be4f23ab279a8c7565d97c2b33420b3003d97ea059d5152e2d60f87cbb7a9d8c790730849553b2181514a6cd58564a29aeefad0ec0",
+                "rlp" : "0xf90260f901f8a0315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f84fb9fd05a6169e6e31f15f527fce50b1b92cb905d38b614cf99afa1c1df23ba0d807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867a03f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0a00b027e66fc5e69819f9c080e9df89914d7d159ace646928599c3e8f8eee6c488fb9463e317433049f862f86080018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba02263a45338e3fd8975ecb00bb2be4f23ab279a8c7565d97c2b33420b3003d97ea059d5152e2d60f87cbb7a9d8c790730849553b2181514a6cd58564a29aeefad0ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -328,8 +342,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbc6ae9218631af51abf428b88d44c9b4b97c81d3fea9d88203cd307f05cce58a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6e4d70b07abef152584128b8790ef2389f190ea45b68a6a5e07b8310c25a527e",
-        "network" : "Frontier",
+        "lastblockhash" : "0xdf421ddc7a183d8a484bd382c812243f3ae95f066ecc331d07367551d732649b",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -398,10 +412,10 @@
             }
         }
     },
-    "TouchToEmptyAccountRevert_d0g0v0_Homestead" : {
+    "TouchToEmptyAccountRevert_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/stRevertTest/TouchToEmptyAccountRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -413,9 +427,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0xf2cbf6c5a0eb80f0e8d81413339adb468e8c75822290510dcef2e0ab8b9f30af",
-                    "mixHash" : "0xd47350b8f7c6376b9ec4fdba72795d07fc5b01662ba9584fe064e8ed507bd791",
-                    "nonce" : "0x972a056d1f24d33f",
+                    "hash" : "0x100e6469af4250159025825cab945dca7353d59563fafa0ad11c7644a5cca660",
+                    "mixHash" : "0x5a6640d7bcf050cdb87195291c19a58e156b1b01ae159c8cc38732187604f851",
+                    "nonce" : "0x37513d7d69379010",
                     "number" : "0x01",
                     "parentHash" : "0x315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416",
                     "receiptTrie" : "0x3f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56a",
@@ -424,7 +438,7 @@
                     "transactionsTrie" : "0xd807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f84fb9fd05a6169e6e31f15f527fce50b1b92cb905d38b614cf99afa1c1df23ba0d807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867a03f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0d47350b8f7c6376b9ec4fdba72795d07fc5b01662ba9584fe064e8ed507bd79188972a056d1f24d33ff862f86080018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba02263a45338e3fd8975ecb00bb2be4f23ab279a8c7565d97c2b33420b3003d97ea059d5152e2d60f87cbb7a9d8c790730849553b2181514a6cd58564a29aeefad0ec0",
+                "rlp" : "0xf90260f901f8a0315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f84fb9fd05a6169e6e31f15f527fce50b1b92cb905d38b614cf99afa1c1df23ba0d807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867a03f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a05a6640d7bcf050cdb87195291c19a58e156b1b01ae159c8cc38732187604f8518837513d7d69379010f862f86080018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba02263a45338e3fd8975ecb00bb2be4f23ab279a8c7565d97c2b33420b3003d97ea059d5152e2d60f87cbb7a9d8c790730849553b2181514a6cd58564a29aeefad0ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -461,8 +475,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbc6ae9218631af51abf428b88d44c9b4b97c81d3fea9d88203cd307f05cce58a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf2cbf6c5a0eb80f0e8d81413339adb468e8c75822290510dcef2e0ab8b9f30af",
-        "network" : "Homestead",
+        "lastblockhash" : "0x100e6469af4250159025825cab945dca7353d59563fafa0ad11c7644a5cca660",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -531,10 +545,10 @@
             }
         }
     },
-    "TouchToEmptyAccountRevert_d0g0v0_Metropolis" : {
+    "TouchToEmptyAccountRevert_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/stRevertTest/TouchToEmptyAccountRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -546,18 +560,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0xdf2a14313205292d1b7a02cb9d326a13f334bd07d893a6c7bd483d82bd365ca5",
-                    "mixHash" : "0xa9eb384de959f4da46f2f984fe93b2d9766f816d1fcab1a1d7daa152082eb8f7",
-                    "nonce" : "0xd9561c1e6f0d4394",
+                    "hash" : "0xc62bbbe5a1858535868ca4b350935ed6610ac34c853478e59bcd2ef603b4448e",
+                    "mixHash" : "0x4684716a1e5f8457b89f3b1b4b2a0a7a7aecf3a7ccf19d5f1d56f97b2fe1c284",
+                    "nonce" : "0x186c6131170c87ba",
                     "number" : "0x01",
                     "parentHash" : "0x315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416",
-                    "receiptTrie" : "0x33206fdb0b04af73aed5fcc49c377894a2ad7acc74a06782884999e9c75de4ba",
-                    "stateRoot" : "0xf6293e80736531f83021d7d88e5d206df6083c003e90b0e3e8731037ad31416e",
+                    "receiptTrie" : "0x3f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56a",
+                    "stateRoot" : "0xf84fb9fd05a6169e6e31f15f527fce50b1b92cb905d38b614cf99afa1c1df23b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f6293e80736531f83021d7d88e5d206df6083c003e90b0e3e8731037ad31416ea0d807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867a033206fdb0b04af73aed5fcc49c377894a2ad7acc74a06782884999e9c75de4bab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0a9eb384de959f4da46f2f984fe93b2d9766f816d1fcab1a1d7daa152082eb8f788d9561c1e6f0d4394f862f86080018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba02263a45338e3fd8975ecb00bb2be4f23ab279a8c7565d97c2b33420b3003d97ea059d5152e2d60f87cbb7a9d8c790730849553b2181514a6cd58564a29aeefad0ec0",
+                "rlp" : "0xf90260f901f8a0315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f84fb9fd05a6169e6e31f15f527fce50b1b92cb905d38b614cf99afa1c1df23ba0d807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867a03f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a04684716a1e5f8457b89f3b1b4b2a0a7a7aecf3a7ccf19d5f1d56f97b2fe1c28488186c6131170c87baf862f86080018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba02263a45338e3fd8975ecb00bb2be4f23ab279a8c7565d97c2b33420b3003d97ea059d5152e2d60f87cbb7a9d8c790730849553b2181514a6cd58564a29aeefad0ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -594,16 +608,142 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbc6ae9218631af51abf428b88d44c9b4b97c81d3fea9d88203cd307f05cce58a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdf2a14313205292d1b7a02cb9d326a13f334bd07d893a6c7bd483d82bd365ca5",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc62bbbe5a1858535868ca4b350935ed6610ac34c853478e59bcd2ef603b4448e",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f51170",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3fe90",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f16000556001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x60006000600060006000731000000000000000000000000000000000000000617530f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f16000556001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x60006000600060006000731000000000000000000000000000000000000000617530f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "TouchToEmptyAccountRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/TouchToEmptyAccountRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x011170",
+                    "hash" : "0xa098c292e24a7d069e84cb49356b998c28f21f5157971645bad3e2bfa7360626",
+                    "mixHash" : "0x7e1cb4989bfac0530065db5f660b70d3116ad7e14a73ec81babddbaff810a653",
+                    "nonce" : "0xd0b317bdf485a407",
+                    "number" : "0x01",
+                    "parentHash" : "0x315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416",
+                    "receiptTrie" : "0x3f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56a",
+                    "stateRoot" : "0xf84fb9fd05a6169e6e31f15f527fce50b1b92cb905d38b614cf99afa1c1df23b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f84fb9fd05a6169e6e31f15f527fce50b1b92cb905d38b614cf99afa1c1df23ba0d807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867a03f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a07e1cb4989bfac0530065db5f660b70d3116ad7e14a73ec81babddbaff810a65388d0b317bdf485a407f862f86080018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba02263a45338e3fd8975ecb00bb2be4f23ab279a8c7565d97c2b33420b3003d97ea059d5152e2d60f87cbb7a9d8c790730849553b2181514a6cd58564a29aeefad0ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x011170",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2263a45338e3fd8975ecb00bb2be4f23ab279a8c7565d97c2b33420b3003d97e",
+                        "s" : "0x59d5152e2d60f87cbb7a9d8c790730849553b2181514a6cd58564a29aeefad0e",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xdbc6ae9218631af51abf428b88d44c9b4b97c81d3fea9d88203cd307f05cce58",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbc6ae9218631af51abf428b88d44c9b4b97c81d3fea9d88203cd307f05cce58a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa098c292e24a7d069e84cb49356b998c28f21f5157971645bad3e2bfa7360626",
+        "network" : "Homestead",
+        "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "",